[Pkg-ganeti-devel] [ganeti] 08/13: Merge tag 'debian/2.12.3-1' into bpo-wheezy
Apollon Oikonomopoulos
apoikos at moszumanska.debian.org
Fri Sep 18 11:03:58 UTC 2015
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 d2da009bd145d6c238e8cdfeeb41cb5a830d3f77
Merge: fc9f7a2 8093487
Author: Apollon Oikonomopoulos <apoikos at debian.org>
Date: Thu Apr 30 17:34:07 2015 +0300
Merge tag 'debian/2.12.3-1' into bpo-wheezy
ganeti Debian release 2.12.3-1
Conflicts:
debian/changelog
debian/patches/series
Makefile.am | 116 ++++-
Makefile.in | 187 +++++---
NEWS | 128 ++++++
configure | 66 ++-
configure.ac | 26 +-
debian/changelog | 70 ++-
debian/copyright | 4 +-
debian/molly-guard-helper | 23 +-
debian/patches/fix-wconfd-metad | 28 --
debian/patches/ghc7.8.patch | 138 ++++++
debian/patches/series | 2 +-
debian/po/nl.po | 57 +++
debian/po/sv.po | 57 +++
devel/build_chroot | 497 +++++++++++++++++++++
doc/admin.rst | 2 +-
doc/design-daemons.rst | 22 +-
doc/design-file-based-storage.rst | 4 +-
doc/design-storagetypes.rst | 4 +-
doc/examples/systemd/ganeti-master.target | 8 +
doc/examples/systemd/ganeti-node.target | 8 +
doc/examples/systemd/ganeti.service | 18 +
doc/examples/systemd/ganeti.target | 8 +
doc/html/_sources/admin.txt | 2 +-
doc/html/_sources/design-daemons.txt | 22 +-
doc/html/_sources/design-file-based-storage.txt | 4 +-
doc/html/_sources/design-storagetypes.txt | 4 +-
doc/html/_sources/install.txt | 8 +-
doc/html/_sources/news.txt | 128 ++++++
doc/html/admin.html | 12 +-
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 | 36 +-
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 | 14 +-
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 | 14 +-
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 | 18 +-
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 | 283 +++++++++---
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/install.rst | 8 +-
doc/news.rst | 128 ++++++
lib/backend.py | 1 +
lib/bootstrap.py | 72 +--
lib/client/gnt_cluster.py | 7 +-
lib/client/gnt_instance.py | 14 +-
lib/client/gnt_network.py | 6 +-
lib/cmdlib/cluster.py | 109 ++++-
lib/cmdlib/common.py | 27 ++
lib/cmdlib/instance.py | 12 +-
lib/cmdlib/instance_storage.py | 26 ++
lib/cmdlib/node.py | 3 +
lib/config.py | 40 +-
lib/hypervisor/hv_base.py | 8 +-
lib/hypervisor/hv_xen.py | 105 +++--
lib/jqueue/__init__.py | 26 +-
lib/masterd/instance.py | 24 +-
lib/mcpu.py | 6 +
lib/objects.py | 6 +
lib/pathutils.py | 2 +
lib/rpc/transport.py | 21 +-
lib/rpc_defs.py | 2 +-
lib/serializer.py | 6 +-
lib/ssh.py | 8 +-
lib/storage/bdev.py | 28 +-
lib/storage/gluster.py | 4 +-
lib/tools/burnin.py | 3 +-
lib/tools/node_daemon_setup.py | 3 +-
lib/utils/storage.py | 10 +
lib/utils/x509.py | 15 +-
lib/watcher/__init__.py | 6 +-
lib/watcher/state.py | 2 +-
lib/wconfd.py | 4 +-
man/gnt-backup.8.in | 5 +-
man/gnt-backup.gen | 13 +-
man/gnt-backup.html.in | 2 +-
man/gnt-backup.rst | 13 +-
man/gnt-cluster.8.in | 2 +-
man/gnt-cluster.gen | 2 +-
man/gnt-cluster.html.in | 2 +-
man/gnt-cluster.rst | 2 +-
man/gnt-instance.8.in | 4 +-
man/gnt-instance.gen | 4 +-
man/gnt-instance.html.in | 4 +-
man/gnt-instance.rst | 4 +-
qa/ganeti-qa.py | 38 +-
qa/qa_cluster.py | 49 +-
qa/qa_instance.py | 30 +-
qa/qa_job_utils.py | 21 +
qa/qa_utils.py | 85 +++-
src/Ganeti/BasicTypes.hs | 33 ++
src/Ganeti/Confd/Client.hs | 8 +-
src/Ganeti/Confd/Server.hs | 1 +
src/Ganeti/Config.hs | 2 +-
src/Ganeti/Constants.hs | 4 +
src/Ganeti/Daemon.hs | 24 +-
src/Ganeti/DataCollectors/Types.hs | 23 +-
src/Ganeti/HTools/CLI.hs | 2 +-
src/Ganeti/HTools/Cluster.hs | 2 +-
src/Ganeti/HTools/Program/Hroller.hs | 2 +-
src/Ganeti/Hypervisor/Xen/Types.hs | 6 +-
src/Ganeti/JSON.hs | 5 +
src/Ganeti/Lens.hs | 27 +-
src/Ganeti/Logging/WriterLog.hs | 26 +-
src/Ganeti/Metad/Config.hs | 5 +-
src/Ganeti/Metad/ConfigServer.hs | 15 +-
src/Ganeti/Monitoring/Server.hs | 3 +
src/Ganeti/Objects.hs | 10 +-
src/Ganeti/OpCodes.hs | 1 +
src/Ganeti/Path.hs | 5 +
src/Ganeti/Query/Common.hs | 2 +-
src/Ganeti/Query/Exec.hs | 95 ++--
src/Ganeti/Query/Instance.hs | 2 +-
src/Ganeti/Query/Network.hs | 26 +-
src/Ganeti/Query/Server.hs | 2 +-
src/Ganeti/Rpc.hs | 25 +-
src/Ganeti/Ssconf.hs | 81 ++--
src/Ganeti/THH/HsRPC.hs | 27 +-
src/Ganeti/Utils.hs | 13 +-
src/Ganeti/Utils/Livelock.hs | 16 +-
src/Ganeti/Utils/MonadPlus.hs | 11 +
src/Ganeti/Utils/Statistics.hs | 2 +-
src/Ganeti/WConfd/ConfigVerify.hs | 5 +-
src/Ganeti/WConfd/Core.hs | 54 ++-
src/Ganeti/WConfd/DeathDetection.hs | 17 +-
src/Ganeti/WConfd/Monad.hs | 36 +-
src/Ganeti/WConfd/Server.hs | 5 +-
src/Ganeti/WConfd/Ssconf.hs | 37 +-
test/data/cluster_config_2.11.json | 6 +-
test/hs/Test/Ganeti/HTools/Cluster.hs | 4 +-
test/hs/Test/Ganeti/HTools/Instance.hs | 44 +-
test/hs/Test/Ganeti/Hypervisor/Xen/XmParser.hs | 2 +-
test/hs/Test/Ganeti/Objects.hs | 7 +-
test/hs/Test/Ganeti/OpCodes.hs | 2 +-
test/hs/Test/Ganeti/TestHTools.hs | 19 +-
test/hs/Test/Ganeti/Utils/Statistics.hs | 2 +-
test/py/cmdlib/cluster_unittest.py | 249 +++++++++++
test/py/cmdlib/cmdlib_unittest.py | 74 +++
test/py/cmdlib/group_unittest.py | 1 +
test/py/cmdlib/instance_unittest.py | 24 +
test/py/cmdlib/testsupport/__init__.py | 2 +
test/py/cmdlib/testsupport/config_mock.py | 20 +
.../py/cmdlib/testsupport/pathutils_mock.py | 45 +-
test/py/cmdlib/testsupport/wconfd_mock.py | 3 +
test/py/ganeti.hypervisor.hv_xen_unittest.py | 45 +-
test/py/ganeti.storage.bdev_unittest.py | 2 +
test/py/ganeti.storage.gluster_unittest.py | 7 +-
tools/cfgupgrade | 11 +-
tools/ifup-os.in | 49 +-
tools/kvm-ifup-os | 49 +-
tools/move-instance | 2 +-
lib/wconfd.py => tools/vif-ganeti-metad.in | 71 ++-
tools/xen-ifup-os | 49 +-
vcs-version | 2 +-
230 files changed, 4000 insertions(+), 1330 deletions(-)
diff --cc debian/patches/series
index cd4a168,81f8aae..59e1ed2
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -2,6 -2,4 +2,6 @@@ fix-startup-with-old-config.patc
cfgupgrade12-remove-old-ssconf.patch
0003-Disable-local-checks-during-build.patch
do-not-backup-export-dir.patch
- fix-wconfd-metad
+0001-Create-a-simple-CPP-macro-for-detecting-lens-version.patch
+0002-Construct-lenses-correctly-for-different-lens-versio.patch
+ ghc7.8.patch
--
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