Merge branch 'hotfix-0.4.1' into develop

Conflicts:
	image_creator/version.py
	version

diff --git a/ChangeLog b/ChangeLog
index 51cf167..586fd3f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2013-06-21, v0.4
+       * Populate the USERS metadata in Windows images
+       * Support kamaki 0.9 and synnefo 0.14
+       * Change the metadata file format to json
+       * Support the devflow building system
+
 2013-05-27, v0.3
        * Support media hosting FreeBSD systems
        * Check if remote files exist when uploading images to pithos

diff --git a/docs/conf.py b/docs/conf.py
index 2e40c86..28b2d66 100644 (file)
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -50,9 +50,9 @@ copyright = u'2012, 2013 GRNET S.A. All rights reserved'
 # built documents.
 #
 # The short X.Y version.
-version = '0.3'
+version = '0.4'
 # The full version, including alpha/beta/rc tags.
-release = '0.3'
+release = '0.4'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/image_creator/os_type/windows.py b/image_creator/os_type/windows.py
index 9fb8218..bf237c2 100644 (file)
--- a/image_creator/os_type/windows.py
+++ b/image_creator/os_type/windows.py
@@ -45,9 +45,10 @@ import os
 
 class Windows(OSBase):
     """OS class for Windows"""
-    def __init__(self, rootdev, ghandler, output):
-        super(Windows, self).__init__(rootdev, ghandler, output)
 
+    def _do_collect_metadata(self):
+        """Collect metadata about the OS"""
+        super(Windows, self)._do_collect_metadata()
         self.meta["USERS"] = " ".join(self._get_users())
 
     def _get_users(self):