[Pkg-ganeti-devel] [ganeti] 01/02: Merge branch 'master' into bpo-wheezy

[Apollon Oikonomopoulos]

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

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

commit 0224aa3e1dfcc9de094a7eccb4ee0aeba02f5c4b
Merge: b72e4b4 31ec8d5
Author: Apollon Oikonomopoulos <apoikos at gmail.com>
Date:   Thu Oct 17 23:35:02 2013 +0300

    Merge branch 'master' into bpo-wheezy
    
    Conflicts:
    	debian/changelog
            - Drop old bpo entry

 NEWS                                       |   12 ++++++
 configure                                  |   24 +++++------
 configure.ac                               |    2 +-
 daemons/daemon-util.in                     |    2 +
 debian/changelog                           |   13 ++++--
 debian/control                             |    7 ++--
 debian/ganeti.dirs                         |    1 +
 debian/rules                               |    1 +
 doc/admin.rst                              |    6 ++-
 doc/html/_sources/admin.txt                |    6 ++-
 doc/html/_sources/news.txt                 |   12 ++++++
 doc/html/_sources/walkthrough.txt          |    2 +-
 doc/html/admin.html                        |   15 ++++---
 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-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-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-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-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                     |   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                      |   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                         |   22 +++++++---
 doc/html/ovfconverter.html                 |   10 ++---
 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/virtual-cluster.html              |   10 ++---
 doc/html/walkthrough.html                  |   12 +++---
 doc/news.rst                               |   12 ++++++
 doc/walkthrough.rst                        |    2 +-
 lib/bdev.py                                |    2 +-
 lib/ssh.py                                 |    2 +
 man/harep.1.in                             |   60 +++++++++++++++++++++++++++-
 man/harep.gen                              |   48 +++++++++++++++++++++-
 man/harep.html.in                          |   20 +++++++++-
 man/harep.rst                              |   48 +++++++++++++++++++++-
 qa/qa_cluster.py                           |    3 ++
 src/Ganeti/Path.hs                         |    2 +-
 vcs-version                                |    2 +-
 84 files changed, 576 insertions(+), 334 deletions(-)

diff --cc debian/control
index 9d3b562,d3fb2ab..d9252f1
--- a/debian/control
+++ b/debian/control
@@@ -23,18 -23,19 +23,19 @@@ Vcs-Git: git://anonscm.debian.org/pkg-g
  
  Package: ganeti
  Architecture: all
- Breaks: ganeti2 (<< 2.7.0-2), ganeti-htools (<< 0.3)
+ Breaks: ganeti2 (<< 2.7.0-2), ganeti-htools (<< ${source:Version}),
+  ganeti-htools (>= ${source:Version}.1~)
  Replaces: ganeti2 (<< 2.7.0-2)
  Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, lvm2,
 - openssh-client, openssh-server, bridge-utils, iproute2, iputils-arping,
 + openssh-client, openssh-server, bridge-utils, iproute, iputils-arping,
   openssl, python-simplejson, python-pyparsing, python-openssl,
   python-pyinotify, python-pycurl, python-paramiko, python-bitarray,
   python-ipaddr, socat, fping, ganeti-haskell (>= ${source:Version}),
   ganeti-haskell (<< ${source:Version}.1~), adduser
 -Recommends: drbd8-utils (>= 8.0.7), qemu-system-x86 |
 +Recommends: drbd8-utils (>= 8.0.7), qemu-kvm |
   xen-linux-system-amd64 | xen-linux-system-686-pae,
-  ganeti-instance-debootstrap, ndisc6
- Suggests: ganeti-htools, ganeti-doc
+  ganeti-instance-debootstrap, ndisc6, ganeti-htools
+ Suggests: ganeti-doc
  Provides: ${python:Provides}
  Description: Cluster-based virtualization management software
   Ganeti is a virtual server cluster management software tool built on top

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