Update ChangeLog and version for 0.12.1

diff --git a/ChangeLog b/ChangeLog
index b44a1ee..61b28e3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2014-01-24, v0.12.1
+       * Fix a bug affecting import and export scripts
+
 2013-11-04, v0.12
        * Add support for OpenBSD and NetBSD images (partition resizing is not
          supported yet)

diff --git a/docs/conf.py b/docs/conf.py
index 32f4628..74772f2 100644 (file)
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -45,9 +45,9 @@ copyright = u'2011, 2012, 2013 GRNET S.A. All rights reserved'
 # built documents.
 #
 # The short X.Y version.
-version = '0.12'
+version = '0.12.1'
 # The full version, including alpha/beta/rc tags.
-release = '0.12'
+release = '0.12.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/version.m4 b/version.m4
index 3a2853b..d034798 100644 (file)
--- a/version.m4
+++ b/version.m4
@@ -1 +1 @@
-m4_define([devflow_version], [0.12])
+m4_define([devflow_version], [0.12.1])