[Pkg-ganeti-devel] [ganeti] 01/02: Merge tag 'debian/2.9.4-1' into precise

[Apollon Oikonomopoulos]

This is an automated email from the git hooks/post-receive script.

apoikos pushed a commit to branch precise
in repository ganeti.

commit 3bc75a8a1c54ae313b81afaf6125befdab941943
Merge: 9b6ee50 b4c0977
Author: Apollon Oikonomopoulos <apoikos at debian.org>
Date:   Tue Feb 11 10:20:08 2014 +0200

    Merge tag 'debian/2.9.4-1' into precise
    
    ganeti Debian release 2.9.4-1
    
    Conflicts:
    	debian/changelog
    	 - drop old ubuntu entry

 Makefile.am                                   |  1 +
 Makefile.in                                   |  1 +
 NEWS                                          | 14 ++++++
 configure                                     | 24 ++++-----
 configure.ac                                  |  2 +-
 daemons/daemon-util.in                        |  2 +-
 debian/changelog                              |  6 +--
 doc/html/_sources/news.txt                    | 14 ++++++
 doc/html/admin.html                           | 10 ++--
 doc/html/cluster-merge.html                   | 10 ++--
 doc/html/design-2.0.html                      | 10 ++--
 doc/html/design-2.1.html                      | 10 ++--
 doc/html/design-2.2.html                      | 10 ++--
 doc/html/design-2.3.html                      | 10 ++--
 doc/html/design-2.4.html                      | 10 ++--
 doc/html/design-2.5.html                      | 10 ++--
 doc/html/design-2.6.html                      | 10 ++--
 doc/html/design-2.7.html                      | 10 ++--
 doc/html/design-2.8.html                      | 10 ++--
 doc/html/design-2.9.html                      | 10 ++--
 doc/html/design-autorepair.html               | 10 ++--
 doc/html/design-bulk-create.html              | 10 ++--
 doc/html/design-chained-jobs.html             | 10 ++--
 doc/html/design-cpu-pinning.html              | 10 ++--
 doc/html/design-daemons.html                  | 10 ++--
 doc/html/design-device-uuid-name.html         | 10 ++--
 doc/html/design-draft.html                    | 10 ++--
 doc/html/design-glusterfs-ganeti-support.html | 10 ++--
 doc/html/design-hroller.html                  | 10 ++--
 doc/html/design-htools-2.3.html               | 10 ++--
 doc/html/design-http-server.html              | 10 ++--
 doc/html/design-impexp2.html                  | 10 ++--
 doc/html/design-internal-shutdown.html        | 10 ++--
 doc/html/design-linuxha.html                  | 10 ++--
 doc/html/design-lu-generated-jobs.html        | 10 ++--
 doc/html/design-monitoring-agent.html         | 10 ++--
 doc/html/design-multi-reloc.html              | 10 ++--
 doc/html/design-network.html                  | 10 ++--
 doc/html/design-node-add.html                 | 10 ++--
 doc/html/design-oob.html                      | 10 ++--
 doc/html/design-openvswitch.html              | 10 ++--
 doc/html/design-opportunistic-locking.html    | 10 ++--
 doc/html/design-ovf-support.html              | 10 ++--
 doc/html/design-partitioned.html              | 10 ++--
 doc/html/design-query-splitting.html          | 10 ++--
 doc/html/design-query2.html                   | 10 ++--
 doc/html/design-reason-trail.html             | 10 ++--
 doc/html/design-resource-model.html           | 10 ++--
 doc/html/design-restricted-commands.html      | 10 ++--
 doc/html/design-shared-storage.html           | 10 ++--
 doc/html/design-storagetypes.html             | 10 ++--
 doc/html/design-virtual-clusters.html         | 10 ++--
 doc/html/design-x509-ca.html                  | 10 ++--
 doc/html/devnotes.html                        | 10 ++--
 doc/html/glossary.html                        | 10 ++--
 doc/html/hooks.html                           | 10 ++--
 doc/html/iallocator.html                      | 10 ++--
 doc/html/index.html                           | 10 ++--
 doc/html/install-quick.html                   | 10 ++--
 doc/html/install.html                         | 10 ++--
 doc/html/locking.html                         | 10 ++--
 doc/html/manpages.html                        | 10 ++--
 doc/html/monitoring-query-format.html         | 10 ++--
 doc/html/move-instance.html                   | 10 ++--
 doc/html/news.html                            | 24 +++++++--
 doc/html/ovfconverter.html                    | 10 ++--
 doc/html/rapi.html                            | 10 ++--
 doc/html/search.html                          | 10 ++--
 doc/html/searchindex.js                       |  2 +-
 doc/html/security.html                        | 10 ++--
 doc/html/upgrade.html                         | 10 ++--
 doc/html/virtual-cluster.html                 | 10 ++--
 doc/html/walkthrough.html                     | 10 ++--
 doc/news.rst                                  | 14 ++++++
 lib/cmdlib/cluster.py                         |  7 +++
 lib/cmdlib/instance.py                        |  4 +-
 lib/cmdlib/instance_storage.py                |  6 ++-
 lib/cmdlib/instance_utils.py                  | 10 +++-
 lib/config.py                                 |  4 +-
 lib/rapi/rlib2.py                             | 17 +++++--
 qa/ganeti-qa.py                               | 11 +++++
 qa/qa_rapi.py                                 | 71 +++++++++++++++++++++++++++
 src/Ganeti/Query/Query.hs                     |  8 +++
 src/Ganeti/Query/Server.hs                    |  3 +-
 test/py/ganeti.cmdlib_unittest.py             | 12 +++--
 test/py/ganeti.rapi.rlib2_unittest.py         | 17 +++++--
 vcs-version                                   |  2 +-
 87 files changed, 545 insertions(+), 361 deletions(-)


-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ganeti/ganeti.git