diff options
| author | Runar Borge <runar@borge.nu> | 2019-01-16 22:56:52 +0100 |
|---|---|---|
| committer | Runar Borge <runar@borge.nu> | 2019-01-16 22:56:52 +0100 |
| commit | 4b01d95b118b88c12f48284a91ee71fc04d60cb5 (patch) | |
| tree | cad98f36d4b9abd995b76fc7042bee9913b36c3f /.gitmodules | |
| parent | fc61294dd0c7edef9fab3a6e96ddf287df25c3fa (diff) | |
| parent | 04389cbef57a5f36eb8dccd5dc2d81ef5e94f9b2 (diff) | |
| download | vyos-build-4b01d95b118b88c12f48284a91ee71fc04d60cb5.tar.gz vyos-build-4b01d95b118b88c12f48284a91ee71fc04d60cb5.zip | |
Merge remote-tracking branch 'upstream/current' into current
Diffstat (limited to '.gitmodules')
| -rw-r--r-- | .gitmodules | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/.gitmodules b/.gitmodules index dafb012a..939d77c6 100644 --- a/.gitmodules +++ b/.gitmodules @@ -74,10 +74,6 @@ path = packages/vyatta-cluster url = https://github.com/vyos/vyatta-cluster.git branch = current -[submodule "packages/vyatta-vrrp"] - path = packages/vyatta-vrrp - url = https://github.com/vyos/vyatta-vrrp.git - branch = current [submodule "packages/vyatta-eventwatch"] path = packages/vyatta-eventwatch url = https://github.com/vyos/vyatta-eventwatch.git @@ -130,10 +126,6 @@ path = packages/vyatta-ravpn url = https://github.com/vyos/vyatta-ravpn.git branch = current -[submodule "packages/vyos-pppoe-server"] - path = packages/vyos-pppoe-server - url = https://github.com/vyos/vyos-pppoe-server.git - branch = current [submodule "packages/vyos-nhrp"] path = packages/vyos-nhrp url = https://github.com/vyos/vyos-nhrp.git @@ -193,3 +185,12 @@ [submodule "packages/frr"] path = packages/frr url = https://github.com/FRRouting/frr.git + branch = master +[submodule "packages/conntrack-tools"] + path = packages/conntrack-tools + url = https://github.com/vyos/conntrack-tools.git + branch = current +[submodule "packages/eventwatchd"] + path = packages/eventwatchd + url = https://github.com/vyos/eventwatchd.git + branch = current
\ No newline at end of file |