[Pkg-ganeti-devel] [ganeti] 02/04: Merge branch 'upstream' into upstream-exp
Apollon Oikonomopoulos
apoikos at moszumanska.debian.org
Thu Feb 27 14:58:32 UTC 2014
This is an automated email from the git hooks/post-receive script.
apoikos pushed a commit to branch upstream-exp
in repository ganeti.
commit c2b98c1fd976ddaa02943c56592e2e9213927805
Merge: 31f4414 54b2e14
Author: Apollon Oikonomopoulos <apoikos at debian.org>
Date: Sun Feb 16 21:23:51 2014 +0200
Merge branch 'upstream' into upstream-exp
Makefile.am | 1 +
Makefile.in | 1 +
NEWS | 53 +++++++++++++
configure | 27 +++----
configure.ac | 5 +-
daemons/daemon-util.in | 12 ++-
doc/css/style.css | 4 +
doc/glossary.rst | 81 ++++++++++----------
doc/html/_sources/glossary.txt | 81 ++++++++++----------
doc/html/_sources/index.txt | 87 +++++++++------------
doc/html/_sources/news.txt | 53 +++++++++++++
doc/html/_static/style.css | 4 +
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 | 91 +++++++++++-----------
doc/html/hooks.html | 10 +--
doc/html/iallocator.html | 10 +--
doc/html/index.html | 96 ++++++++++++------------
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 | 63 ++++++++++++++--
doc/html/ovfconverter.html | 10 +--
doc/html/rapi.html | 12 +--
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 | 87 +++++++++------------
doc/news.rst | 53 +++++++++++++
lib/cli.py | 17 +++++
lib/client/gnt_instance.py | 1 +
lib/cmdlib/cluster.py | 7 ++
lib/cmdlib/instance.py | 4 +-
lib/cmdlib/instance_storage.py | 6 +-
lib/cmdlib/instance_utils.py | 10 ++-
lib/cmdlib/tags.py | 21 ++++--
lib/cmdlib/test.py | 12 ++-
lib/config.py | 4 +-
lib/constants.py | 3 +-
lib/hypervisor/hv_base.py | 4 +-
lib/hypervisor/hv_kvm.py | 6 +-
lib/hypervisor/hv_xen.py | 4 +-
lib/jqueue.py | 4 +-
lib/luxi.py | 15 +++-
lib/objects.py | 8 +-
lib/query.py | 8 +-
lib/rapi/rlib2.py | 51 +++++++++++--
man/ganeti-os-interface.7.in | 5 +-
man/ganeti-os-interface.gen | 6 +-
man/ganeti-os-interface.html.in | 2 +-
man/ganeti-os-interface.rst | 6 +-
man/gnt-instance.8.in | 32 +++++++-
man/gnt-instance.gen | 24 +++++-
man/gnt-instance.html.in | 14 +++-
man/gnt-instance.rst | 24 +++++-
qa/ganeti-qa.py | 13 ++++
qa/qa_job.py | 104 +++++++++++++++++++++++++-
qa/qa_rapi.py | 73 ++++++++++++++++++
qa/qa_tags.py | 6 ++
src/Ganeti/Config.hs | 2 +-
src/Ganeti/OpParams.hs | 6 ++
src/Ganeti/Query/Node.hs | 2 +-
src/Ganeti/Query/Query.hs | 8 ++
src/Ganeti/Query/Server.hs | 4 +-
test/hs/Test/Ganeti/OpCodes.hs | 2 +
test/py/ganeti.cmdlib_unittest.py | 12 +--
test/py/ganeti.hypervisor.hv_xen_unittest.py | 6 +-
test/py/ganeti.objects_unittest.py | 23 ++++--
test/py/ganeti.query_unittest.py | 23 +++---
test/py/ganeti.rapi.rlib2_unittest.py | 17 ++++-
test/py/ganeti.rpc_unittest.py | 35 ++++-----
vcs-version | 2 +-
122 files changed, 1314 insertions(+), 735 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