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 /packages | |
| 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 'packages')
| m--------- | packages/conntrack-tools | 0 | ||||
| m--------- | packages/eventwatchd | 0 | ||||
| m--------- | packages/vyatta-vrrp | 0 | ||||
| m--------- | packages/vyos-pppoe-server | 0 |
4 files changed, 0 insertions, 0 deletions
diff --git a/packages/conntrack-tools b/packages/conntrack-tools new file mode 160000 +Subproject 77cf2ae1cfc281ab11d3fa5ddc73c11bcb60ccd diff --git a/packages/eventwatchd b/packages/eventwatchd new file mode 160000 +Subproject c3d8ae7352f3e9c65b0f05dda245d144252574c diff --git a/packages/vyatta-vrrp b/packages/vyatta-vrrp deleted file mode 160000 -Subproject c6411d8c4c1a11f0305ddee2824d7081cd2654a diff --git a/packages/vyos-pppoe-server b/packages/vyos-pppoe-server deleted file mode 160000 -Subproject 566709144fb119d32cc029615cff2e688a8a755 |