diff options
| author | Daniil Baturin <daniil@baturin.org> | 2018-11-05 03:05:18 +0100 |
|---|---|---|
| committer | Daniil Baturin <daniil@baturin.org> | 2018-11-05 03:05:18 +0100 |
| commit | 59e465463ef3f6a77cc9ea952ce0ac540bc7ab5d (patch) | |
| tree | 641881ca34e7f1f555699efe7261a27327bf63ac | |
| parent | 963040ae7bbe00177d9567a4bdb02f432d1638e4 (diff) | |
| parent | 34e9c8f20fca0dd88ea41c632ce8c145b533248c (diff) | |
| download | vyatta-cfg-system-59e465463ef3f6a77cc9ea952ce0ac540bc7ab5d.tar.gz vyatta-cfg-system-59e465463ef3f6a77cc9ea952ce0ac540bc7ab5d.zip | |
Merge branch 'crux' of https://github.com/vyos/vyatta-cfg-system into crux
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | cfg-version/dhcp-relay@2 (renamed from cfg-version/dhcp-relay@1) | 0 |
2 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 0c513a49..d09fdb83 100644 --- a/Makefile.am +++ b/Makefile.am @@ -121,7 +121,7 @@ curver_DATA += cfg-version/system@9 curver_DATA += cfg-version/broadcast-relay@1 curver_DATA += cfg-version/mdns@1 curver_DATA += cfg-version/dhcp-server@5 -curver_DATA += cfg-version/dhcp-relay@1 +curver_DATA += cfg-version/dhcp-relay@2 curver_DATA += cfg-version/ssh@1 cpiop = find . ! -regex '\(.*~\|.*\.bak\|.*\.swp\|.*\#.*\#\)' -print0 | \ diff --git a/cfg-version/dhcp-relay@1 b/cfg-version/dhcp-relay@2 index e69de29b..e69de29b 100644 --- a/cfg-version/dhcp-relay@1 +++ b/cfg-version/dhcp-relay@2 |