[Debian-ha-commits] [fence-agents] 02/03: Merge branch 'upstream'

Christoph Berg myon at debian.org
Fri Feb 5 16:13:18 UTC 2016


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

myon pushed a commit to branch master
in repository fence-agents.

commit 914a8aa67c81de117eed017c0e2831f4ecba8fcd
Merge: 9ab4e69 eeb4618
Author: Christoph Berg <christoph.berg at credativ.de>
Date:   Fri Feb 5 16:55:12 2016 +0100

    Merge branch 'upstream'

 .tarball-version                                   |   2 +-
 .version                                           |   2 +-
 ChangeLog                                          | 262 ++++++
 Makefile.in                                        |  46 +-
 aclocal.m4                                         | 203 +++--
 compile                                            |   2 +-
 config.guess                                       |  15 +-
 config.sub                                         |  19 +-
 configure                                          | 363 ++++----
 configure.ac                                       |   3 +
 depcomp                                            |   2 +-
 doc/Makefile.in                                    |  25 +-
 fence/Makefile.in                                  |  23 +-
 fence/agents/Makefile.in                           |  23 +-
 fence/agents/alom/Makefile.in                      |  32 +-
 fence/agents/amt/Makefile.in                       |  32 +-
 fence/agents/amt/fence_amt.py                      |  12 +-
 fence/agents/apc/Makefile.in                       |  32 +-
 fence/agents/apc/fence_apc.py                      |   2 +-
 fence/agents/apc_snmp/Makefile.in                  |  32 +-
 fence/agents/bladecenter/Makefile.in               |  32 +-
 fence/agents/brocade/Makefile.in                   |  32 +-
 fence/agents/brocade/fence_brocade.py              |   2 +-
 fence/agents/cisco_mds/Makefile.in                 |  32 +-
 fence/agents/cisco_ucs/Makefile.in                 |  32 +-
 fence/agents/compute/Makefile.in                   |  32 +-
 fence/agents/compute/fence_compute.py              | 180 +++-
 fence/agents/docker/Makefile.in                    |  32 +-
 fence/agents/docker/fence_docker.py                |  16 +-
 fence/agents/drac/Makefile.in                      |  32 +-
 fence/agents/drac5/Makefile.in                     |  32 +-
 fence/agents/dummy/Makefile.in                     |  32 +-
 fence/agents/eaton_snmp/Makefile.in                |  32 +-
 fence/agents/emerson/Makefile.in                   |  32 +-
 fence/agents/eps/Makefile.in                       |  32 +-
 fence/agents/hds_cb/Makefile.in                    |  32 +-
 fence/agents/hpblade/Makefile.in                   |  32 +-
 fence/agents/ibmblade/Makefile.in                  |  32 +-
 fence/agents/ifmib/Makefile.in                     |  32 +-
 fence/agents/ilo/Makefile.in                       |  32 +-
 fence/agents/ilo_moonshot/Makefile.in              |  32 +-
 fence/agents/ilo_mp/Makefile.in                    |  32 +-
 fence/agents/ilo_ssh/Makefile.in                   |  32 +-
 fence/agents/intelmodular/Makefile.in              |  32 +-
 fence/agents/ipdu/Makefile.in                      |  32 +-
 fence/agents/ipmilan/Makefile.in                   |  32 +-
 fence/agents/ipmilan/fence_ipmilan.py              |  17 +-
 fence/agents/kdump/Makefile.in                     |  33 +-
 fence/agents/ldom/Makefile.in                      |  32 +-
 fence/agents/lib/Makefile.in                       |  28 +-
 fence/agents/lib/fence2man.xsl                     |   1 +
 fence/agents/lib/fencing.py.py                     |  12 +-
 fence/agents/lpar/Makefile.in                      |  32 +-
 fence/agents/manual/Makefile.in                    |  24 +-
 fence/agents/mpath/Makefile.in                     |  32 +-
 fence/agents/netio/Makefile.in                     |  32 +-
 fence/agents/ovh/Makefile.in                       |  32 +-
 fence/agents/pve/Makefile.in                       |  32 +-
 fence/agents/raritan/Makefile.in                   |  32 +-
 fence/agents/rcd_serial/Makefile.in                |  32 +-
 fence/agents/rhevm/Makefile.in                     |  32 +-
 fence/agents/rsa/Makefile.in                       |  32 +-
 fence/agents/rsb/Makefile.in                       |  32 +-
 fence/agents/sanbox2/Makefile.in                   |  32 +-
 fence/agents/{zvm => sbd}/Makefile.am              |   4 +-
 fence/agents/{amt => sbd}/Makefile.in              |  42 +-
 fence/agents/sbd/fence_sbd.py                      | 421 +++++++++
 fence/agents/scsi/Makefile.am                      |   7 +-
 fence/agents/scsi/Makefile.in                      |  39 +-
 fence/agents/scsi/fence_scsi.py                    |  13 +-
 fence/agents/{zvm => vbox}/Makefile.am             |   2 +-
 fence/agents/{ipdu => vbox}/Makefile.in            |  40 +-
 fence/agents/vbox/fence_vbox.py                    | 113 +++
 fence/agents/virsh/Makefile.in                     |  32 +-
 fence/agents/vmware/Makefile.in                    |  30 +-
 fence/agents/vmware_soap/Makefile.in               |  32 +-
 fence/agents/wti/Makefile.in                       |  32 +-
 fence/agents/xenapi/Makefile.in                    |  32 +-
 fence/agents/zvm/Makefile.am                       |  14 +-
 fence/agents/zvm/Makefile.in                       | 301 ++++++-
 fence/agents/zvm/fence_zvm.c                       | 943 +++++++++++++++++++++
 fence/agents/zvm/fence_zvm_man_page                |  87 ++
 install-sh                                         | 366 ++++----
 make/clusterautoconfig.h.in                        |   3 -
 make/fencebuild.mk                                 |   1 +
 missing                                            |   6 +-
 tests/data/metadata/fence_compute.xml              |  16 +-
 tests/data/metadata/fence_docker.xml               |   5 +
 tests/data/metadata/fence_idrac.xml                |   3 +-
 tests/data/metadata/fence_ilo3.xml                 |   1 +
 tests/data/metadata/fence_ilo4.xml                 |   3 +-
 tests/data/metadata/fence_imm.xml                  |   3 +-
 tests/data/metadata/fence_ipmilan.xml              |   3 +-
 .../metadata/{fence_compute.xml => fence_sbd.xml}  |  63 +-
 .../metadata/{fence_ilo4.xml => fence_vbox.xml}    | 100 +--
 95 files changed, 4211 insertions(+), 1111 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-ha/fence-agents.git



More information about the Debian-HA-Commits mailing list