[Pkg-ganeti-devel] [ganeti] 01/03: Merge tag 'debian/2.5.2-1' into bpo-squeeze

[Apollon Oikonomopoulos]

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

apoikos-guest pushed a commit to branch bpo-squeeze
in repository ganeti.

commit f521cf8d811d47538f999f1331a12c57a10ccdb2
Merge: a93b757 82d139f
Author: Apollon Oikonomopoulos <apoikos at gmail.com>
Date:   Thu Oct 31 11:46:28 2013 +0200

    Merge tag 'debian/2.5.2-1' into bpo-squeeze
    
    Debian release 2.5.2-1
    
    Conflicts:
    	debian/changelog
    	 - drop old bpo entry

 Makefile.am                            |   12 +++--
 Makefile.in                            |   12 +++--
 NEWS                                   |   20 ++++++++
 configure                              |   24 +++++-----
 configure.ac                           |    2 +-
 debian/changelog                       |   18 ++++---
 debian/patches/fix-no-kvm.patch        |   17 +++++++
 debian/patches/series                  |    1 +
 debian/rules                           |    2 +-
 doc/html/_sources/news.txt             |   20 ++++++++
 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-chained-jobs.html      |   10 ++--
 doc/html/design-cpu-pinning.html       |   10 ++--
 doc/html/design-draft.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-lu-generated-jobs.html |   10 ++--
 doc/html/design-multi-reloc.html       |   10 ++--
 doc/html/design-network.html           |   10 ++--
 doc/html/design-oob.html               |   10 ++--
 doc/html/design-ovf-support.html       |   10 ++--
 doc/html/design-query2.html            |   10 ++--
 doc/html/design-shared-storage.html    |   10 ++--
 doc/html/design-x509-ca.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                    |   11 +++--
 doc/html/install-quick.html            |   10 ++--
 doc/html/install.html                  |   10 ++--
 doc/html/locking.html                  |   10 ++--
 doc/html/move-instance.html            |   10 ++--
 doc/html/news.html                     |   28 +++++++++--
 doc/html/rapi.html                     |   10 ++--
 doc/html/search.html                   |   10 ++--
 doc/html/searchindex.js                |    2 +-
 doc/html/security.html                 |   10 ++--
 doc/html/upgrade.html                  |   10 ++--
 doc/html/walkthrough.html              |   10 ++--
 doc/news.rst                           |   20 ++++++++
 lib/hypervisor/hv_kvm.py               |   82 +++++++++++++++++++-------------
 man/gnt-instance.8.in                  |    6 ++-
 man/gnt-instance.gen                   |   15 +++---
 man/gnt-instance.html.in               |    8 +++-
 man/gnt-instance.rst                   |   15 +++---
 qa/qa-sample.json                      |    3 ++
 qa/qa_config.py                        |    9 +++-
 test/ganeti.utils.io_unittest.py       |    1 -
 tools/kvm-ifup.in                      |    4 +-
 vcs-version                            |    2 +-
 59 files changed, 418 insertions(+), 266 deletions(-)


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