[Pkg-ganeti-devel] [ganeti] 02/04: Merge tag 'upstream/2.11.3'

Apollon Oikonomopoulos apoikos at moszumanska.debian.org
Thu Jul 10 09:53:38 UTC 2014


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

apoikos pushed a commit to branch master
in repository ganeti.

commit a06b308d27ee8a6460790c324598bfffeae3b28c
Merge: a48c594 8e14b03
Author: Apollon Oikonomopoulos <apoikos at debian.org>
Date:   Thu Jul 10 12:29:45 2014 +0300

    Merge tag 'upstream/2.11.3'
    
    Upstream version 2.11.3
    
    # gpg: Signature made Πεμ 10 Ιούλ 2014 12:29:41 μμ EEST
    # gpg:                using RSA key 0x72D342C1E9514306
    # gpg: Good signature from "Apollon Oikonomopoulos <apoikos at dmesg.gr>"
    # gpg:                 aka "Apollon Oikonomopoulos <apoikos at gmail.com>"
    # gpg:                 aka "Apollon Oikonomopoulos <apoikos at debian.org>"

 Makefile.am                                   |  3 ++
 Makefile.in                                   |  3 ++
 NEWS                                          | 44 +++++++++++++++++++++-
 configure                                     | 24 ++++++------
 configure.ac                                  |  2 +-
 doc/design-draft.rst                          |  3 +-
 doc/hooks.rst                                 |  4 +-
 doc/html/_sources/design-draft.txt            |  3 +-
 doc/html/_sources/hooks.txt                   |  4 +-
 doc/html/_sources/index.txt                   |  1 +
 doc/html/_sources/news.txt                    | 44 +++++++++++++++++++++-
 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.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                    | 23 +++++++-----
 doc/html/design-file-based-storage.html       | 10 ++---
 doc/html/design-glusterfs-ganeti-support.html | 20 +++++-----
 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-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          | 33 ++++++++---------
 doc/html/design-query2.html                   | 20 +++++-----
 doc/html/design-reason-trail.html             | 20 +++++-----
 doc/html/design-resource-model.html           | 20 +++++-----
 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-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                           | 14 +++----
 doc/html/iallocator.html                      | 10 ++---
 doc/html/index.html                           | 13 ++++---
 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                            | 53 ++++++++++++++++++++++++---
 doc/html/ovfconverter.html                    | 10 ++---
 doc/html/rapi.html                            | 37 ++++++++++---------
 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/index.rst                                 |  1 +
 doc/news.rst                                  | 44 +++++++++++++++++++++-
 lib/backend.py                                | 14 ++++---
 lib/build/sphinx_ext.py                       |  5 ++-
 lib/cli.py                                    |  2 +-
 lib/client/gnt_network.py                     | 27 ++++++++------
 lib/cmdlib/instance.py                        |  6 +--
 lib/cmdlib/instance_storage.py                |  6 +--
 lib/cmdlib/network.py                         | 12 ++++++
 lib/cmdlib/node.py                            | 11 +++---
 lib/ht.py                                     |  3 +-
 lib/hypervisor/hv_kvm.py                      | 36 ++++++++++++++----
 lib/hypervisor/hv_xen.py                      |  1 +
 lib/objects.py                                |  3 ++
 lib/rapi/client.py                            |  5 ++-
 lib/rpc_defs.py                               |  2 +-
 lib/server/noded.py                           |  5 ++-
 man/gnt-network.8.in                          | 15 ++++++--
 man/gnt-network.gen                           | 10 +++--
 man/gnt-network.html.in                       |  5 ++-
 man/gnt-network.rst                           | 10 +++--
 man/hspace.1.in                               | 21 ++++++++++-
 man/hspace.gen                                | 14 +++++++
 man/hspace.html.in                            |  8 +++-
 man/hspace.rst                                | 14 +++++++
 src/Ganeti/HTools/Backend/Luxi.hs             |  5 ++-
 src/Ganeti/HTools/CLI.hs                      | 20 ++++++++++
 src/Ganeti/HTools/Group.hs                    |  5 +++
 src/Ganeti/HTools/Program/Hspace.hs           | 23 ++++++++++--
 src/Ganeti/OpCodes.hs                         |  1 +
 src/Ganeti/OpParams.hs                        |  6 +++
 src/Ganeti/Query/Network.hs                   | 15 ++++++--
 src/Ganeti/Storage/Drbd/Parser.hs             |  1 +
 test/data/htools/hspace-groups-one.data       | 14 +++++++
 test/data/htools/hspace-groups-two.data       | 16 ++++++++
 test/data/instance-prim-sec.txt               | 16 --------
 test/data/proc_drbd84_emptyfirst.txt          | 15 ++++++++
 test/hs/Test/Ganeti/OpCodes.hs                |  2 +-
 test/hs/Test/Ganeti/Storage/Drbd/Parser.hs    | 44 ++++++++++++++++++++++
 test/hs/shelltests/htools-hspace.test         | 26 +++++++++++++
 test/py/cmdlib/backup_unittest.py             |  3 +-
 test/py/cmdlib/instance_migration_unittest.py |  3 +-
 test/py/cmdlib/instance_unittest.py           |  8 ++--
 test/py/ganeti.storage.drbd_unittest.py       | 17 +++++++--
 vcs-version                                   |  2 +-
 139 files changed, 1053 insertions(+), 579 deletions(-)

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



More information about the Pkg-ganeti-devel mailing list