Merge branch 't378-mdns-repeater' into current

* t378-mdns-repeater:
  Updated 'vyos-world' and 'vyos-1x' submodule
  Added 'mdns-repeater' submodule
  Remove 'vyos-cfg-avahi' submodule (superseeded) (T378)
This commit is contained in:
Christian Poessinger 2017-12-09 13:37:05 +01:00
commit b9b04defcf
6 changed files with 8 additions and 8 deletions

6
.gitmodules vendored
View File

@ -127,9 +127,9 @@
[submodule "packages/vyos-1x"]
path = packages/vyos-1x
url = https://github.com/vyos/vyos-1x.git
[submodule "packages/vyos-cfg-avahi"]
path = packages/vyos-cfg-avahi
url = https://github.com/c-po/vyos-cfg-avahi.git
[submodule "packages/vyos-bcast-relay"]
path = packages/vyos-bcast-relay
url = https://github.com/c-po/vyos-bcast-relay.git
[submodule "packages/mdns-repeater"]
path = packages/mdns-repeater
url = https://github.com/vyos/mdns-repeater.git

View File

@ -28,5 +28,5 @@ systemctl disable lldpd
systemctl enable ssh-session-cleanup
/usr/sbin/update-rc.d -f conntrackd remove
systemctl disable conntrackd
/usr/sbin/update-rc.d -f avahi-daemon remove
systemctl disable avahi-daemon
/usr/sbin/update-rc.d -f mdns-repeater remove
systemctl disable mdns-repeater

@ -0,0 +1 @@
Subproject commit 051977458f4078a06008bb6c6fd338cd994cf56c

@ -1 +1 @@
Subproject commit ac6071ae85bee52793f6dc34c2b60e333149291b
Subproject commit ae1e4c704bb324831fb15b6e243710f94700d3f2

@ -1 +0,0 @@
Subproject commit 31448bde1bc3484bf62114f168749d418bf70b0d

@ -1 +1 @@
Subproject commit 416bee9c0a634f8513904f18556bb6d40e9fd2a8
Subproject commit bd86d016c2e0d5342f9610c28855f13d0316acfd