Commit 04809fa2 authored by Nikos Skalkotos's avatar Nikos Skalkotos
Browse files

Merge branch 'master' into debian-precise

parents 9e4f84fe 1b03007c
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//
......
......@@ -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.
......
......@@ -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>`_.
......
......@@ -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:``,
......
......@@ -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,
......
m4_define([devflow_version], [0.11])
m4_define([devflow_version], [0.11.1])
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment