Merge branch 'hotfix-0.11.1'

diff --git a/ChangeLog b/ChangeLog
index 3f2e7ea..11402d1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-10-21, v0.11.1
+       * Fix a bug in pithcat
+       * Minor updates in the documentation
+
 2013-10-18, v0.11
        * Update the documentation
        * Change local-backend identifier from file:// to local//

diff --git a/docs/conf.py b/docs/conf.py
index a40b4a1..563dd9a 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.11'
+version = '0.11.1'
 # The full version, including alpha/beta/rc tags.
-release = '0.11'
+release = '0.11.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/docs/index.rst b/docs/index.rst
index 79b86f0..43df2c4 100644 (file)
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -27,7 +27,7 @@ snf-image also supports Image customization via hooks. Hooks allow for:
 snf-image is being used in large scale production environments with Ganeti to
 successfully deploy many major Linux distributions (Debian, Ubuntu/Kubuntu,
 CentOS, Fedora, OpenSUSE), Windows 2008 R2 & Windows Server 2012, as well as
-FreeBSD 9.1.
+FreeBSD.
 
 The snf-image Ganeti OS Definition is released under
 `GPLv2 <http://www.gnu.org/licenses/gpl-2.0.html>`_.

diff --git a/docs/interface.rst b/docs/interface.rst
index 932a182..8909f5c 100644 (file)
--- a/docs/interface.rst
+++ b/docs/interface.rst
@@ -53,7 +53,7 @@ to be used. If no prefix is used, it defaults to the local backend:
   | For example, if we want to deploy the image file:
   | ``/var/lib/snf-image/slackware.diskdump``
   | We need to assign:
-  | ``img_format=diskdump`` and ``img_id=file://slackware.diskdump``
+  | ``img_id=local://slackware.diskdump``
 
  * **Network backend**:
    If the **imd_id** starts with ``http:``, ``https:``, ``ftp:`` or ``ftps:``,

diff --git a/snf-image-host/pithcat b/snf-image-host/pithcat
index b2c15fc..c0a0a60 100755 (executable)
--- a/snf-image-host/pithcat
+++ b/snf-image-host/pithcat
@@ -134,8 +134,6 @@ def main():
 
     db_uri = environ['PITHCAT_INPUT_DB'] if not options.db else options.db
 
-    print "%s" % db_uri
-
     backend = ModularBackend(None,
                              db_uri if type(url) is LocationURL else None,
                              None,

diff --git a/version b/version
index 51176c7..af88ba8 100644 (file)
--- a/version
+++ b/version
@@ -1 +1 @@
-0.11
+0.11.1

diff --git a/version.m4 b/version.m4
index 92e1f35..cda7189 100644 (file)
--- a/version.m4
+++ b/version.m4
@@ -1 +1 @@
-m4_define([devflow_version], [0.11])
+m4_define([devflow_version], [0.11.1])