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 /.gitmodules | |
| 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 '.gitmodules')
| -rw-r--r-- | .gitmodules | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/.gitmodules b/.gitmodules index fe47ce28..f0c9ea46 100644 --- a/.gitmodules +++ b/.gitmodules @@ -73,9 +73,6 @@ [submodule "packages/vyatta-op-quagga"] path = packages/vyatta-op-quagga url = https://github.com/vyos/vyatta-op-quagga.git -[submodule "packages/vyatta-cfg-dhcp-relay"] - path = packages/vyatta-cfg-dhcp-relay - url = https://github.com/vyos/vyatta-cfg-dhcp-relay.git [submodule "packages/vyatta-op-dhcp-server"] path = packages/vyatta-op-dhcp-server url = https://github.com/vyos/vyatta-op-dhcp-server.git @@ -142,3 +139,9 @@ [submodule "packages/pmacct"] path = packages/pmacct url = https://github.com/vyos/pmacct +[submodule "packages/vyos-strongswan"] + path = packages/vyos-strongswan + url = https://github.com/vyos/vyos-strongswan +[submodule "packages/vyos-frr"] + path = packages/vyos-frr + url = https://github.com/vyos/vyos-frr.git |