[Pkg-ganeti-devel] [ganeti] 02/22: Merge branch 'master' into experimental

[Apollon Oikonomopoulos]

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

apoikos pushed a commit to branch 2.10
in repository ganeti.

commit 8cf6f4c769d81281d19e41d1854beba150542d46
Merge: 538a31e e3f70a6
Author: Apollon Oikonomopoulos <apoikos at gmail.com>
Date:   Sat Jan 11 21:45:29 2014 +0200

    Merge branch 'master' into experimental
    
    Keep master versions of all files and drop
    0001-daemon-util-handle-luxid-in-start-stop-_master.patch which is
    commited upstream.

 NEWS                                               | 116 +++++++++++++++++-
 configure                                          | 132 +++++++++++++++++---
 configure.ac                                       |  12 +-
 daemons/daemon-util.in                             |   2 +
 debian/NEWS                                        |  10 ++
 debian/changelog                                   |  95 +++++++--------
 debian/control                                     |  28 ++---
 debian/ganeti.postinst.in                          |  10 +-
 ...n-util-handle-luxid-in-start-stop-_master.patch |  39 ------
 debian/patches/FTBFS_with_sphinx_1.2.patch         |  16 +++
 debian/patches/series                              |   2 +-
 debian/rules                                       |   2 +-
 doc/html/_sources/news.txt                         | 116 +++++++++++++++++-
 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                                 | 133 +++++++++++++++++++--
 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                                       | 116 +++++++++++++++++-
 lib/backend.py                                     |  16 ++-
 lib/cmdlib/cluster.py                              |   5 +-
 lib/cmdlib/instance.py                             |  95 ++++++++++++---
 lib/cmdlib/instance_migration.py                   |   3 +
 lib/cmdlib/instance_operation.py                   |   2 +-
 lib/cmdlib/instance_storage.py                     |  11 +-
 lib/cmdlib/node.py                                 |   1 +
 lib/constants.py                                   |   8 ++
 lib/hypervisor/hv_kvm.py                           |  20 ++--
 lib/hypervisor/hv_xen.py                           |  85 +++++++++++--
 lib/jqueue.py                                      |   3 +-
 lib/locking.py                                     |  19 +--
 lib/masterd/iallocator.py                          |   2 +-
 lib/network.py                                     |   2 +-
 lib/objects.py                                     |   7 +-
 lib/ovf.py                                         |  14 +--
 lib/storage/bdev.py                                |   2 +-
 lib/storage/drbd_info.py                           |   1 +
 qa/qa_cluster.py                                   |   3 +
 src/Ganeti/HTools/Backend/IAlloc.hs                |   4 +-
 src/Ganeti/HTools/Backend/Luxi.hs                  |   5 +-
 src/Ganeti/HTools/Backend/Rapi.hs                  |   4 +-
 src/Ganeti/Luxi.hs                                 |   6 +-
 src/Ganeti/Path.hs                                 |   2 +-
 src/Ganeti/Rpc.hs                                  |   9 +-
 test/py/ganeti.hypervisor.hv_xen_unittest.py       |  13 +-
 test/py/ganeti.storage.filestorage_unittest.py     |   2 +-
 tools/master-ip-setup                              |  12 +-
 vcs-version                                        |   2 +-
 108 files changed, 1263 insertions(+), 556 deletions(-)

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