[Pkg-ganeti-devel] [ganeti] 01/02: Merge tag 'debian/2.15.0-1' into debian/backports/jessie

Apollon Oikonomopoulos apoikos at moszumanska.debian.org
Mon Aug 24 09:44:08 UTC 2015


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

apoikos pushed a commit to branch debian/backports/jessie
in repository ganeti.

commit 595d64778ff1b535a7f09e22f36b19ab3e06ad99
Merge: d653ece c32a116
Author: Apollon Oikonomopoulos <apoikos at debian.org>
Date:   Mon Aug 24 11:26:54 2015 +0300

    Merge tag 'debian/2.15.0-1' into debian/backports/jessie
    
    ganeti Debian release 2.15.0-1
    
    Conflicts:
    	debian/changelog
             - remove old bpo entry

 INSTALL                                            |   3 +
 Makefile.am                                        |  49 +-
 NEWS                                               | 185 ++++-
 README                                             |   2 +-
 cabal/ganeti.template.cabal                        |   3 +-
 configure.ac                                       |   7 +-
 debian/changelog                                   |  17 +-
 debian/control                                     |  27 +-
 debian/control.in                                  |   2 +
 debian/ganeti-2.14.install                         |   5 -
 debian/ganeti-2.14.prerm                           |  24 -
 debian/ganeti-2.15.install                         |   5 +
 ...ian-overrides => ganeti-2.15.lintian-overrides} |   2 +-
 .../{ganeti-2.14.postinst => ganeti-2.15.postinst} |   0
 debian/ganeti-2.15.prerm                           |  24 +
 ...ganeti-2.14.templates => ganeti-2.15.templates} |   2 +-
 debian/ganeti-haskell-2.14.install                 |   7 -
 debian/ganeti-haskell-2.14.lintian-overrides       |   9 -
 debian/ganeti-haskell-2.14.prerm                   |  24 -
 debian/ganeti-haskell-2.15.install                 |   7 +
 debian/ganeti-haskell-2.15.lintian-overrides       |   9 +
 ...-2.14.postinst => ganeti-haskell-2.15.postinst} |   0
 debian/ganeti-haskell-2.15.prerm                   |  24 +
 ....14.templates => ganeti-haskell-2.15.templates} |   2 +-
 debian/ganeti-htools-2.14.install                  |   3 -
 debian/ganeti-htools-2.14.lintian-overrides        |   5 -
 debian/ganeti-htools-2.14.prerm                    |  24 -
 debian/ganeti-htools-2.15.install                  |   3 +
 debian/ganeti-htools-2.15.lintian-overrides        |   5 +
 ...s-2.14.postinst => ganeti-htools-2.15.postinst} |   0
 debian/ganeti-htools-2.15.prerm                    |  24 +
 ...2.14.templates => ganeti-htools-2.15.templates} |   2 +-
 debian/gbp.conf                                    |   2 +-
 debian/rules                                       |  25 +-
 debian/watch                                       |   2 +-
 devel/build_chroot                                 |   8 +
 doc/admin.rst                                      |   2 +-
 doc/conf.py                                        |   2 +-
 doc/design-2.15.rst                                |  13 +
 doc/design-allocation-efficiency.rst               |  59 ++
 doc/design-dedicated-allocation.rst                |  87 +++
 doc/design-draft.rst                               |   4 +-
 doc/design-multi-storage-htools.rst                | 167 ++++
 doc/design-shared-storage-redundancy.rst           |  73 ++
 doc/examples/ganeti.default                        |   1 +
 doc/examples/ganeti.default-debug                  |   1 +
 doc/hooks.rst                                      |   2 +-
 doc/iallocator.rst                                 |   2 +-
 doc/index.rst                                      |   3 +
 doc/install.rst                                    |  52 +-
 doc/security.rst                                   |   2 +-
 doc/virtual-cluster.rst                            |   2 +-
 lib/backend.py                                     |  55 +-
 lib/client/gnt_debug.py                            |  27 +
 lib/cmdlib/backup.py                               |  57 +-
 lib/cmdlib/cluster/__init__.py                     |   3 +-
 lib/cmdlib/instance_create.py                      |  51 +-
 lib/cmdlib/instance_helpervm.py                    | 172 +++++
 lib/cmdlib/instance_storage.py                     |   6 +-
 lib/cmdlib/node.py                                 |  14 +-
 lib/metad.py                                       |  96 +++
 lib/pathutils.py                                   |   2 +
 lib/rpc_defs.py                                    |   3 -
 lib/server/noded.py                                |  13 +-
 lib/ssh.py                                         |  22 -
 lib/tools/cfgupgrade.py                            |  84 +-
 lib/tools/common.py                                |   9 +-
 lib/tools/node_daemon_setup.py                     | 100 +--
 lib/tools/prepare_node_join.py                     |   2 +-
 lib/tools/ssh_update.py                            |   2 +-
 lib/tools/ssl_update.py                            |   2 +-
 man/gnt-cluster.rst                                |  24 +-
 man/gnt-debug.rst                                  |  10 +
 man/gnt-instance.rst                               |   7 +
 man/hail.rst                                       |  15 +-
 man/hbal.rst                                       |  19 +-
 man/hcheck.rst                                     |  12 +
 qa/qa_cluster.py                                   |   4 +-
 src/Ganeti/Constants.hs                            |  14 +
 src/Ganeti/Daemon.hs                               |   4 +-
 src/Ganeti/DataCollectors.hs                       |   6 +
 src/Ganeti/DataCollectors/Types.hs                 |   7 +-
 src/Ganeti/DataCollectors/XenCpuLoad.hs            | 173 +++++
 src/Ganeti/HTools/Backend/IAlloc.hs                |  44 +-
 src/Ganeti/HTools/Backend/MonD.hs                  | 306 ++++++++
 src/Ganeti/HTools/Backend/Text.hs                  |  21 +-
 src/Ganeti/HTools/CLI.hs                           |  55 +-
 src/Ganeti/HTools/Cluster.hs                       | 842 ++-------------------
 src/Ganeti/HTools/Cluster/Evacuate.hs              | 411 ++++++++++
 src/Ganeti/HTools/Cluster/Metrics.hs               | 221 ++++++
 src/Ganeti/HTools/Cluster/Moves.hs                 | 189 +++++
 src/Ganeti/HTools/Cluster/Utils.hs                 | 150 ++++
 src/Ganeti/HTools/Dedicated.hs                     | 257 +++++++
 src/Ganeti/HTools/ExtLoader.hs                     | 183 +----
 src/Ganeti/HTools/GlobalN1.hs                      |  85 +++
 src/Ganeti/HTools/Loader.hs                        |  19 +-
 src/Ganeti/HTools/Node.hs                          |   7 +-
 src/Ganeti/HTools/PeerMap.hs                       |   5 +
 src/Ganeti/HTools/Program/Hail.hs                  |  26 +-
 src/Ganeti/HTools/Program/Hbal.hs                  |  47 +-
 src/Ganeti/HTools/Program/Hcheck.hs                |  91 ++-
 src/Ganeti/HTools/Program/Hinfo.hs                 |  10 +-
 src/Ganeti/HTools/Program/Hscan.hs                 |   3 +-
 src/Ganeti/HTools/Program/Hspace.hs                |   7 +-
 src/Ganeti/HTools/Program/Hsqueeze.hs              |   3 +-
 src/Ganeti/JSON.hs                                 |   5 +
 src/Ganeti/Logging/WriterLog.hs                    |   5 +-
 src/Ganeti/Metad/ConfigCore.hs                     | 130 ++++
 src/Ganeti/Metad/ConfigServer.hs                   |  61 +-
 src/Ganeti/Metad/Server.hs                         |   3 +-
 src/Ganeti/Metad/WebServer.hs                      |  19 +-
 src/Ganeti/THH/HsRPC.hs                            |   1 +
 src/Ganeti/Utils.hs                                |  15 +-
 src/hs2py.hs                                       |   4 +
 test/data/cluster_config_2.14.json                 | 652 ++++++++++++++++
 test/data/htools/hail-alloc-dedicated-1.json       | 260 +++++++
 test/data/htools/hail-multialloc-dedicated.json    | 284 +++++++
 test/data/htools/shared-n1-failure.data            |  20 +
 .../HTools/{ExtLoader.hs => Backend/MonD.hs}       |  14 +-
 test/hs/Test/Ganeti/HTools/Backend/Text.hs         |  65 +-
 test/hs/Test/Ganeti/HTools/Cluster.hs              |  21 +-
 test/hs/Test/Ganeti/Utils.hs                       |  13 +
 test/hs/htest.hs                                   |   4 +-
 test/hs/shelltests/htools-hail.test                |  12 +-
 test/hs/shelltests/htools-hbal.test                |  17 +
 test/hs/shelltests/htools-hcheck.test              |  24 +
 test/hs/shelltests/htools-single-group.test        |  11 -
 test/py/cfgupgrade_unittest.py                     |   8 +-
 test/py/ganeti.backend_unittest.py                 |  46 +-
 test/py/ganeti.tools.common_unittest.py            |  85 ++-
 test/py/ganeti.tools.node_daemon_setup_unittest.py | 138 ----
 tools/ssl-update                                   |  21 -
 132 files changed, 5048 insertions(+), 1901 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