diff options
| author | Christian Poessinger <christian@poessinger.com> | 2019-12-04 17:13:59 +0100 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2019-12-04 17:13:59 +0100 |
| commit | a96ffc33cc63918ba3815f66c506c717a8676621 (patch) | |
| tree | f883f5976a40f2066f500363931a5e499374b8de /src/helpers | |
| parent | 26677aa3ce312a5b980ea88d57feebd09e39fd98 (diff) | |
| parent | aceb4d7e187a571019e4bc24cd23efc7c2f624fe (diff) | |
| download | vyos-1x-a96ffc33cc63918ba3815f66c506c717a8676621.tar.gz vyos-1x-a96ffc33cc63918ba3815f66c506c717a8676621.zip | |
Merge branch 'current' of github.com:vyos/vyos-1x into equuleus
* 'current' of github.com:vyos/vyos-1x:
shutdown: T1826: Modify cancel reboot msg
T1801: move escaping of backslashes into configtree
vxlan: T1636: remove unused import statements
geneve: T1799: remove unused import statements
Diffstat (limited to 'src/helpers')
| -rwxr-xr-x | src/helpers/vyos-merge-config.py | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/helpers/vyos-merge-config.py b/src/helpers/vyos-merge-config.py index e9a14ae98..7ae62cfb3 100755 --- a/src/helpers/vyos-merge-config.py +++ b/src/helpers/vyos-merge-config.py @@ -72,9 +72,6 @@ merge_config_tree = ConfigTree(config_file) effective_config = Config() output_effective_config = effective_config.show_config() -# showConfig (called by config.show_config() does not escape -# backslashes, which configtree expects; cf. T1001. -output_effective_config = output_effective_config.replace("\\", "\\\\") effective_config_tree = ConfigTree(output_effective_config) |