[Debian-ha-commits] [pacemaker] 21/69: Merge pull request #870 from kgaillot/1.1

[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 7a9e1a6f24f63d17f9a96ef0d5e6974b528f2c9c
Merge: 0836f2a 60ab487
Author: Ken Gaillot <kgaillot at redhat.com>
Date:   Wed Dec 23 12:00:27 2015 -0600

    Merge pull request #870 from kgaillot/1.1
    
    Release 1.1.14-rc4

 ChangeLog                               |  9 +++++++++
 cib/io.c                                |  2 +-
 cib/messages.c                          |  2 +-
 crmd/control.c                          |  4 ++--
 crmd/election.c                         |  2 +-
 crmd/fsa_defines.h                      | 19 +++++++++----------
 crmd/messages.c                         | 10 +++++-----
 crmd/te_actions.c                       |  2 +-
 doc/Pacemaker_Remote/en-US/Ch-Intro.txt |  2 +-
 fencing/main.c                          |  2 +-
 lib/cib/cib_utils.c                     |  2 +-
 lib/cluster/election.c                  |  4 ++--
 lib/cluster/heartbeat.c                 |  4 ++--
 lib/common/digest.c                     |  2 +-
 lib/common/mainloop.c                   |  2 +-
 lib/common/utils.c                      |  4 ++--
 lib/common/xml.c                        | 10 +++++-----
 lib/pengine/native.c                    |  2 +-
 lib/pengine/unpack.c                    |  6 ++++--
 lib/pengine/utils.c                     |  8 ++++----
 pengine/allocate.c                      |  7 ++++---
 pengine/clone.c                         |  2 +-
 pengine/master.c                        |  2 +-
 tools/crmadmin.c                        |  2 +-
 tools/test.iso8601.c                    |  2 +-
 25 files changed, 62 insertions(+), 51 deletions(-)

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