[Debian-ha-commits] [pacemaker] 65/69: Imported Upstream version 1.1.14

[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 4f0ffeda50c9b3e814dc6b59a0d2750edb377883
Merge: b93b409 70404b0
Author: Ferenc Wágner <wferi at niif.hu>
Date:   Sun Jan 17 21:49:04 2016 +0100

    Imported Upstream version 1.1.14

 ChangeLog          | 49 +++++++++----------------------------------------
 cib/callbacks.c    |  6 ++++--
 configure.ac       |  4 ++--
 crmd/fsa_defines.h |  2 +-
 crmd/te_utils.c    |  2 +-
 fencing/commands.c |  2 +-
 6 files changed, 18 insertions(+), 47 deletions(-)

diff --cc configure.ac
index b9a863a,c200a68..c16459d
--- a/configure.ac
+++ b/configure.ac
@@@ -1161,7 -1161,7 +1161,7 @@@ AC_DEFINE_UNQUOTED(RH_STONITH_PREFIX,"$
  AC_PATH_PROGS(GIT, git false)
  AC_MSG_CHECKING(build version)
  
- BUILD_VERSION=36ff430
 -BUILD_VERSION=$Format:%h$
++BUILD_VERSION=70404b0
  if test $BUILD_VERSION != ":%h$"; then
     AC_MSG_RESULT(archive hash: $BUILD_VERSION)
  

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