[Pkg-ganeti-devel] [ganeti] 01/04: Merge tag 'debian/2.10.2-1' into bpo-wheezy

[Apollon Oikonomopoulos]

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

apoikos pushed a commit to branch bpo-wheezy
in repository ganeti.

commit 035d06cf69f9adf11627fa725e40c836d9aeb35c
Merge: 0362ac7 68a9c99
Author: Apollon Oikonomopoulos <apoikos at debian.org>
Date:   Wed Mar 26 13:49:55 2014 +0200

    Merge tag 'debian/2.10.2-1' into bpo-wheezy
    
    ganeti Debian release 2.10.2-1
    
    Conflicts:
    	debian/changelog
            - drop old bpo entry

 Makefile.am                                   |   2 +
 Makefile.in                                   |   2 +
 NEWS                                          |  11 +++
 autotools/check-news                          |   2 +-
 configure                                     |  24 ++---
 configure.ac                                  |   2 +-
 debian/15-ganeti                              |  11 +++
 debian/NEWS                                   |   8 ++
 debian/changelog                              |  21 ++++-
 debian/control                                |   4 +-
 debian/ganeti-2.10.install                    |   1 +
 debian/ganeti.dirs                            |   1 +
 debian/ganeti.install                         |   1 +
 debian/ganeti.postinst.in                     |  55 ++++++-----
 debian/molly-guard-helper                     |  96 +++++++++++++++++++
 debian/templates/ganeti-VER.install           |   1 +
 doc/html/_sources/news.txt                    |  11 +++
 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.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-daemons.html                  |  10 +-
 doc/html/design-device-uuid-name.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-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-optables.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-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                         |  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                            |  21 ++++-
 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/news.rst                                  |  11 +++
 lib/backend.py                                |   2 +-
 lib/client/gnt_cluster.py                     |   2 +
 lib/hypervisor/hv_base.py                     |   7 +-
 lib/hypervisor/hv_chroot.py                   |  12 ++-
 lib/hypervisor/hv_fake.py                     |   5 +-
 lib/hypervisor/hv_kvm.py                      | 104 ++++++++++++--------
 lib/hypervisor/hv_lxc.py                      |  15 ++-
 lib/hypervisor/hv_xen.py                      |  44 ++++++---
 lib/watcher/__init__.py                       |  12 ++-
 qa/qa_cluster.py                              |   5 +-
 qa/qa_config.py                               | 131 ++++++++++++++++++++++++++
 qa/qa_logging.py                              |  73 ++++++++++++++
 qa/qa_rapi.py                                 |  21 +++--
 qa/qa_utils.py                                |  47 +--------
 test/py/ganeti.hypervisor.hv_xen_unittest.py  |  15 ++-
 vcs-version                                   |   2 +-
 110 files changed, 992 insertions(+), 556 deletions(-)

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