diff options
| author | Scott Moser <smoser@brickies.net> | 2017-01-20 10:06:55 -0500 |
|---|---|---|
| committer | Scott Moser <smoser@brickies.net> | 2017-01-20 10:06:55 -0500 |
| commit | d00b7dba8767618ae360f56bf64b7ab7a8c49d2e (patch) | |
| tree | 349799f76c39669a03a6acbd48502970c0abb994 /cloudinit/mergers/m_str.py | |
| parent | fa3009b64949fef3744ddb940f01477dfa2d25e5 (diff) | |
| parent | 7fb6f78177b5ece10ca7c54ba3958010a9987f06 (diff) | |
| download | vyos-cloud-init-d00b7dba8767618ae360f56bf64b7ab7a8c49d2e.tar.gz vyos-cloud-init-d00b7dba8767618ae360f56bf64b7ab7a8c49d2e.zip | |
merge from 0.7.9 at 0.7.9
Diffstat (limited to 'cloudinit/mergers/m_str.py')
| -rw-r--r-- | cloudinit/mergers/m_str.py | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/cloudinit/mergers/m_str.py b/cloudinit/mergers/m_str.py index b00c4bf3..629df58e 100644 --- a/cloudinit/mergers/m_str.py +++ b/cloudinit/mergers/m_str.py @@ -1,21 +1,8 @@ -# -*- coding: utf-8 -*- -# vi: ts=4 expandtab -# # Copyright (C) 2012 Yahoo! Inc. # # Author: Joshua Harlow <harlowja@yahoo-inc.com> # -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License version 3, as -# published by the Free Software Foundation. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# This file is part of cloud-init. See LICENSE file for license information. import six @@ -44,3 +31,5 @@ class Merger(object): return value + six.text_type(merge_with) else: return value + six.binary_type(merge_with) + +# vi: ts=4 expandtab |