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

[Apollon Oikonomopoulos]

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 71ff282d8ace18794149625948490adb83a1b1a2
Merge: 23f56b3 c137693
Author: Apollon Oikonomopoulos <apoikos at debian.org>
Date:   Fri Sep 18 10:44:33 2015 +0300

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

 Makefile.am                         |  1 +
 NEWS                                | 22 +++++++++++++
 cabal/ganeti.template.cabal         | 20 +++++++-----
 configure.ac                        |  2 +-
 debian/NEWS                         |  2 +-
 debian/changelog                    | 23 ++++++++++----
 debian/patches/relax-deps           |  8 ++---
 doc/design-optables.rst             |  2 +-
 doc/design-shared-storage.rst       |  4 ++-
 lib/backend.py                      | 10 +++++-
 lib/bootstrap.py                    |  7 +++--
 lib/cli.py                          |  3 +-
 lib/cli_opts.py                     |  1 +
 lib/cmdlib/instance.py              | 10 +++---
 lib/cmdlib/instance_migration.py    |  3 +-
 lib/cmdlib/instance_storage.py      |  5 +--
 lib/storage/extstorage.py           | 10 ++++++
 lib/watcher/__init__.py             |  2 +-
 man/ganeti-extstorage-interface.rst | 17 ++++++++++
 man/ganeti.rst                      | 11 +++++--
 man/gnt-backup.rst                  |  4 +--
 man/gnt-cluster.rst                 |  4 +--
 man/gnt-group.rst                   | 12 +++----
 man/gnt-instance.rst                | 42 ++++++++++++-------------
 man/gnt-network.rst                 |  6 ++--
 man/gnt-node.rst                    | 19 ++++++-----
 man/gnt-os.rst                      |  2 +-
 qa/qa_instance.py                   |  3 ++
 src/Ganeti/Confd/Server.hs          | 63 +++++++++++++++++++++++--------------
 src/Ganeti/JQueue.hs                |  5 ++-
 src/Ganeti/Metad/Config.hs          | 62 ++++++++++++++++++++++--------------
 src/Ganeti/Metad/ConfigCore.hs      | 20 +++++++-----
 src/Ganeti/OpCodes.hs               |  2 +-
 src/Ganeti/Query/Instance.hs        | 20 +++++++-----
 src/Ganeti/Query/Language.hs        |  7 +++++
 src/Ganeti/Query/Query.hs           | 12 ++++---
 test/py/cmdlib/instance_unittest.py | 15 +++++++++
 37 files changed, 310 insertions(+), 151 deletions(-)

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