diff options
| author | Daniil Baturin <daniil@baturin.org> | 2018-10-28 23:17:50 +0100 |
|---|---|---|
| committer | Daniil Baturin <daniil@baturin.org> | 2018-10-28 23:17:50 +0100 |
| commit | c084316669ff70f34fef3a2e054982693d539edd (patch) | |
| tree | 6645c635ae3da2d39a558b3116268a067ed2d236 /packages | |
| parent | d8c4adcaeb1315195b99e2f59840d856a60608be (diff) | |
| parent | 4d16dbead89c44aca5bcc91981a98572b9c15f16 (diff) | |
| download | vyos-build-c084316669ff70f34fef3a2e054982693d539edd.tar.gz vyos-build-c084316669ff70f34fef3a2e054982693d539edd.zip | |
Merge branch 'current' into crux
Conflicts:
data/live-build-config/package-lists/vyos-utils.list.chroot
scripts/live-build-config
Diffstat (limited to 'packages')
| m--------- | packages/vyatta-cfg-dhcp-relay | 0 | ||||
| m--------- | packages/vyos-frr | 0 | ||||
| m--------- | packages/vyos-strongswan | 0 |
3 files changed, 0 insertions, 0 deletions
diff --git a/packages/vyatta-cfg-dhcp-relay b/packages/vyatta-cfg-dhcp-relay deleted file mode 160000 -Subproject 85c7b8b985685e859067ff75afebdb6fa64ed8e diff --git a/packages/vyos-frr b/packages/vyos-frr new file mode 160000 +Subproject 6ba5fb8036f9155a3f724d43513e89ab8f07e8d diff --git a/packages/vyos-strongswan b/packages/vyos-strongswan new file mode 160000 +Subproject 5f1a6880eb6ac98deb48b915bc574c2a5260831 |