[Debian-ha-commits] [pacemaker] 47/69: Merge tag 'upstream/1.1.14_rc5' into debian/master

[Christoph Berg]

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

myon pushed a commit to branch debian/master
in repository pacemaker.

commit 4cae0b47d3953605e9d33e520c9a1728c5aa37da
Merge: 32a2c65 b93b409
Author: Ferenc Wágner <wferi at niif.hu>
Date:   Sat Jan 9 09:00:10 2016 +0100

    Merge tag 'upstream/1.1.14_rc5' into debian/master
    
    Upstream version 1.1.14~rc5

 .gitignore                                         |  1 +
 BasicSanity.sh                                     | 50 +++++++++-------
 ChangeLog                                          | 21 ++++++-
 Makefile.am                                        |  1 -
 autogen.sh                                         |  2 +-
 cib/common.c                                       |  2 +-
 cib/io.c                                           |  2 +-
 cib/messages.c                                     |  2 +-
 configure.ac                                       | 20 +++----
 crmd/Makefile.am                                   |  5 +-
 crmd/control.c                                     | 11 +---
 crmd/election.c                                    |  2 +-
 crmd/fsa_defines.h                                 | 21 ++++---
 crmd/lrm.c                                         |  4 +-
 crmd/messages.c                                    | 10 ++--
 crmd/te_actions.c                                  |  2 +-
 cts/CTStests.py                                    |  6 +-
 cts/patterns.py                                    |  9 ++-
 doc/Makefile.am                                    | 23 +++++---
 doc/Pacemaker_Remote/en-US/Ch-Intro.txt            |  2 +-
 extra/PCMK-MIB.txt                                 | 66 ++++++++++++++--------
 extra/showscores.sh                                |  4 +-
 fencing/Makefile.am                                |  2 +
 fencing/commands.c                                 | 18 +-----
 fencing/main.c                                     |  2 +-
 fencing/regression.py.in                           | 27 +++++----
 include/crm/common/xml.h                           |  2 +-
 include/crm/lrmd.h                                 |  2 +-
 lib/cib/cib_utils.c                                |  2 +-
 lib/cluster/Makefile.am                            |  4 +-
 lib/cluster/election.c                             |  4 +-
 lib/cluster/heartbeat.c                            |  4 +-
 lib/common/digest.c                                |  2 +-
 lib/common/mainloop.c                              |  2 +-
 lib/common/remote.c                                |  2 +-
 lib/common/utils.c                                 |  6 +-
 lib/common/watchdog.c                              |  1 -
 lib/common/xml.c                                   | 10 ++--
 lib/fencing/st_client.c                            | 30 ++++++++--
 lib/pengine/native.c                               |  4 +-
 lib/pengine/unpack.c                               | 10 ++--
 lib/pengine/utils.c                                | 14 ++---
 lrmd/Makefile.am                                   |  2 +
 mcp/Makefile.am                                    |  6 +-
 pengine/Makefile.am                                |  4 +-
 pengine/allocate.c                                 |  7 ++-
 pengine/clone.c                                    |  4 +-
 pengine/graph.c                                    |  4 +-
 pengine/master.c                                   |  2 +-
 pengine/native.c                                   |  2 +-
 pengine/regression.sh                              | 12 ++--
 .../{group-dependants.dot => group-dependents.dot} |  0
 .../{group-dependants.exp => group-dependents.exp} |  0
 ...p-dependants.scores => group-dependents.scores} |  0
 ...dependants.summary => group-dependents.summary} |  0
 .../{group-dependants.xml => group-dependents.xml} |  0
 ...-dependant-ban.dot => master-dependent-ban.dot} |  0
 ...-dependant-ban.exp => master-dependent-ban.exp} |  0
 ...dant-ban.scores => master-dependent-ban.scores} |  0
 ...nt-ban.summary => master-dependent-ban.summary} |  0
 ...-dependant-ban.xml => master-dependent-ban.xml} |  0
 tools/Makefile.am                                  |  5 +-
 tools/crm_resource.c                               | 18 ++----
 tools/crmadmin.c                                   |  2 +-
 tools/test.iso8601.c                               |  2 +-
 valgrind-pcmk.suppressions                         |  2 +-
 xml/Makefile.am                                    |  5 +-
 xml/best-match.sh                                  |  2 +-
 xml/regression.sh                                  |  2 +-
 69 files changed, 274 insertions(+), 221 deletions(-)

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