diff options
| author | Daniil Baturin <daniil@baturin.org> | 2019-03-31 17:41:19 +0200 |
|---|---|---|
| committer | Daniil Baturin <daniil@baturin.org> | 2019-03-31 17:41:19 +0200 |
| commit | 7e2a2e37e72e649b5eb42362e0469101c7ce19cc (patch) | |
| tree | 636944e4ba7bcb13bd18bc3f70391faab8c3ebcc /packages | |
| parent | 819bb96bd26c1495d6fef2e6477bb96cf147ec22 (diff) | |
| parent | dda8ec6f3a46b2dfe9f627c620b7fb57c25d70dc (diff) | |
| download | vyos-build-7e2a2e37e72e649b5eb42362e0469101c7ce19cc.tar.gz vyos-build-7e2a2e37e72e649b5eb42362e0469101c7ce19cc.zip | |
Merge branch 'current' into crux
Conflicts:
data/kernel_version
scripts/build-config
scripts/defaults.py
scripts/live-build-config
Diffstat (limited to 'packages')
| m--------- | packages/hvinfo | 0 | ||||
| m--------- | packages/ipaddrcheck | 0 | ||||
| m--------- | packages/libyang | 0 | ||||
| m--------- | packages/lldpd | 0 | ||||
| m--------- | packages/pdns-recursor | 0 | ||||
| m--------- | packages/vyatta-webgui | 0 |
6 files changed, 0 insertions, 0 deletions
diff --git a/packages/hvinfo b/packages/hvinfo new file mode 160000 +Subproject 6d15dff8eb5418a23035d18078f367bc799b702 diff --git a/packages/ipaddrcheck b/packages/ipaddrcheck new file mode 160000 +Subproject 8f0d655cc68995a0ef88dc905dc62db2af23ec9 diff --git a/packages/libyang b/packages/libyang new file mode 160000 +Subproject 179da47f2e8def1907372408a9df97a0dcbc134 diff --git a/packages/lldpd b/packages/lldpd new file mode 160000 +Subproject adbb26bc0a49d083472d24762255ff48bd001e4 diff --git a/packages/pdns-recursor b/packages/pdns-recursor new file mode 160000 +Subproject 28af51a3942875f0896fab2ea5945ded4a19197 diff --git a/packages/vyatta-webgui b/packages/vyatta-webgui deleted file mode 160000 -Subproject 30133ba0fd68b0c3726127f195e1058c427fe58 |