[Pkg-ganeti-devel] [ganeti] 11/13: Merge tag 'debian/2.12.4-1' into bpo-wheezy

[Apollon Oikonomopoulos]

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

apoikos pushed a commit to branch debian/backports/wheezy
in repository ganeti.

commit 41780f78051451dc0c4fb077bed73b00686a81db
Merge: b161b52 fd1f4db
Author: Apollon Oikonomopoulos <apoikos at debian.org>
Date:   Wed May 13 14:01:50 2015 +0300

    Merge tag 'debian/2.12.4-1' into bpo-wheezy
    
    ganeti Debian release 2.12.4-1
    
    Conflicts:
    	debian/changelog

 Makefile.am                                     |  54 ++++++-
 Makefile.in                                     | 109 +++++++++-----
 NEWS                                            |  26 ++++
 configure                                       |  41 +++--
 configure.ac                                    |   6 +-
 debian/changelog                                |  21 ++-
 debian/control                                  |   1 -
 debian/rules                                    |   2 +-
 doc/html/_sources/install.txt                   |   6 +-
 doc/html/_sources/news.txt                      |  26 ++++
 doc/html/admin.html                             |  10 +-
 doc/html/cluster-keys-replacement.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.10.html                       |  10 +-
 doc/html/design-2.11.html                       |  10 +-
 doc/html/design-2.12.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-ceph-ganeti-support.html        |  10 +-
 doc/html/design-chained-jobs.html               |  10 +-
 doc/html/design-cmdlib-unittests.html           |  10 +-
 doc/html/design-cpu-pinning.html                |  10 +-
 doc/html/design-cpu-speed.html                  |  10 +-
 doc/html/design-daemons.html                    |  10 +-
 doc/html/design-device-uuid-name.html           |  10 +-
 doc/html/design-disks.html                      |  10 +-
 doc/html/design-draft.html                      |  10 +-
 doc/html/design-file-based-storage.html         |  10 +-
 doc/html/design-glusterfs-ganeti-support.html   |  10 +-
 doc/html/design-hotplug.html                    |  10 +-
 doc/html/design-hroller.html                    |  10 +-
 doc/html/design-hsqueeze.html                   |  10 +-
 doc/html/design-htools-2.3.html                 |  10 +-
 doc/html/design-http-server.html                |  10 +-
 doc/html/design-hugepages-support.html          |  10 +-
 doc/html/design-impexp2.html                    |  10 +-
 doc/html/design-internal-shutdown.html          |  10 +-
 doc/html/design-kvmd.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-move-instance-improvements.html |  10 +-
 doc/html/design-multi-reloc.html                |  10 +-
 doc/html/design-multi-version-tests.html        |  10 +-
 doc/html/design-network.html                    |  10 +-
 doc/html/design-node-add.html                   |  10 +-
 doc/html/design-node-security.html              |  10 +-
 doc/html/design-oob.html                        |  10 +-
 doc/html/design-openvswitch.html                |  10 +-
 doc/html/design-opportunistic-locking.html      |  10 +-
 doc/html/design-optables.html                   |  10 +-
 doc/html/design-os.html                         |  10 +-
 doc/html/design-ovf-support.html                |  10 +-
 doc/html/design-partitioned.html                |  10 +-
 doc/html/design-performance-tests.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-ssh-ports.html                  |  10 +-
 doc/html/design-storagetypes.html               |  10 +-
 doc/html/design-systemd.html                    |  10 +-
 doc/html/design-upgrade.html                    |  10 +-
 doc/html/design-virtual-clusters.html           |  10 +-
 doc/html/design-x509-ca.html                    |  10 +-
 doc/html/dev-codestyle.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                           |  14 +-
 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                              | 189 ++++++++++++++----------
 doc/html/ovfconverter.html                      |  10 +-
 doc/html/rapi.html                              |  34 ++---
 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/install.rst                                 |   6 +-
 doc/news.rst                                    |  26 ++++
 lib/backend.py                                  |   5 +-
 lib/cmdlib/cluster.py                           |  11 +-
 lib/config.py                                   |   7 +-
 src/Ganeti/JQueue.hs                            |   5 +-
 src/Ganeti/Luxi.hs                              |  11 +-
 src/Ganeti/Metad/ConfigServer.hs                |  16 +-
 src/Ganeti/Query/Exec.hs                        |   8 +-
 src/Ganeti/UDSServer.hs                         |   9 +-
 src/Ganeti/Utils.hs                             |  20 ++-
 src/Ganeti/WConfd/Server.hs                     |  13 +-
 test/py/cmdlib/cluster_unittest.py              |  14 +-
 test/py/ganeti.backend_unittest.py              |  35 +++++
 vcs-version                                     |   2 +-
 113 files changed, 935 insertions(+), 624 deletions(-)


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