merge from 0.7.9 at 0.7.9

1 files changed, 6 insertions, 16 deletions

diff --git a/cloudinit/sources/helpers/vmware/imc/config_file.py b/cloudinit/sources/helpers/vmware/imc/config_file.py
index bb9fb7dc..14293f3c 100644
--- a/cloudinit/sources/helpers/vmware/imc/config_file.py
+++ b/cloudinit/sources/helpers/vmware/imc/config_file.py
@@ -1,21 +1,9 @@
-# vi: ts=4 expandtab
-#
-#    Copyright (C) 2015 Canonical Ltd.
-#    Copyright (C) 2015 VMware Inc.
-#
-#    Author: Sankar Tanguturi <stanguturi@vmware.com>
+# Copyright (C) 2015 Canonical Ltd.
+# Copyright (C) 2015 VMware Inc.
 #
-#    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.
+# Author: Sankar Tanguturi <stanguturi@vmware.com>
 #
-#    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 logging
 
@@ -127,3 +115,5 @@ class ConfigFile(ConfigSource, dict):
         prefix -- prefix of the key
         """
         return len([key for key in self if key.startswith(prefix)])
+
+# vi: ts=4 expandtab