Merge pull request #1176 from kgaillot/rc2

Release 1.1.16-rc2
ClusterLabs · Nov 17, 2016 · c4ca169 · c4ca169
2 parents dfbd96d + 9a871a3
commit c4ca169
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 52 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,14 @@
+* Wed Nov 16 2016 Ken Gaillot <kgaillot@redhat.com> Pacemaker-1.1.16-1
+- Update source tarball to revision: a145ce1
+- Changesets: 9
+- Diff:       12 files changed, 40 insertions(+), 56 deletions(-)
+
+- Changes since Pacemaker-1.1.16-rc1
+  + Fix minor build issue
+  + Correct license specified for some library source files to LGPL
+  + systemd: order pacemaker after time-sync target
+
+
 * Thu Nov 03 2016 Ken Gaillot <kgaillot@redhat.com> Pacemaker-1.1.16-rc1
 - Update source tarball to revision: 2fc4716
 - Changesets: 360

diff --git a/cts/patterns.py b/cts/patterns.py
@@ -305,11 +305,11 @@ def __init__(self, name):
         self.components["corosync"] = [
             r"pacemakerd.*error:.*Connection destroyed",
             r"attrd.*:\s*crit:.*Lost connection to Corosync service",
-            r"stonith.*:\s*Corosync connection terminated",
+            r"stonith.*:\s*(Corosync connection terminated|Shutting down)",
             r"cib.*:\s*Corosync connection lost!\s+Exiting.",
-            r"crmd.*:\s*connection terminated",
+            r"crmd.*:\s*(connection terminated|Disconnected from Corosync)",
             r"pengine.*Scheduling Node .* for STONITH",
-            r"crmd.*:\s*Peer %s was terminated \(.*\) by .* for .*:\s*OK",
+            r"crmd.*:\s*Peer .* was terminated \(.*\) by .* for .*:\s*OK",
         ]
 
         self.components["cib-ignore"] = [

diff --git a/lib/common/cib_secrets.c b/lib/common/cib_secrets.c
@@ -1,22 +1,9 @@
 /*
- * cib_secrets.c
- *
- * Author: Dejan Muhamedagic <dejan@suse.de>
  * Copyright (c) 2011 SUSE, Attachmate
+ * Author: Dejan Muhamedagic <dejan@suse.de>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- * 
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * This source code is licensed under the GNU Lesser General Public License
+ * version 2.1 or later (LGPLv2.1+) WITHOUT ANY WARRANTY.
  */
 
 #include <crm_internal.h>

diff --git a/lib/common/watchdog.c b/lib/common/watchdog.c
@@ -2,19 +2,8 @@
  * Copyright (C) 2013 Lars Marowsky-Bree <lmb@suse.com>
  *               2014 Andrew Beekhof <andrew@beekhof.net>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * This source code is licensed under the GNU Lesser General Public License
+ * version 2.1 or later (LGPLv2.1+) WITHOUT ANY WARRANTY.
  */
 
 #include <crm_internal.h>

diff --git a/lib/services/upstart.c b/lib/services/upstart.c
@@ -1,27 +1,9 @@
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * File: upstart-dbus.c
  * Copyright (C) 2010 Senko Rasic <senko.rasic@dobarkod.hr>
  * Copyright (c) 2010 Ante Karamatic <ivoks@init.hr>
  *
- *
- * Each exported function is standalone, and creates a new connection to
- * the upstart daemon. This is because lrmd plugins fork off for exec,
- * and if we try and share the connection, the whole thing blocks
- * indefinitely.
+ * This source code is licensed under the GNU Lesser General Public License
+ * version 2.1 or later (LGPLv2.1+) WITHOUT ANY WARRANTY.
  */
 
 #include <crm_internal.h>

diff --git a/lrmd/pacemaker_remote.service.in b/lrmd/pacemaker_remote.service.in
@@ -2,6 +2,7 @@
 Description=Pacemaker Remote Service
 Documentation=man:pacemaker_remoted http://clusterlabs.org/doc/en-US/Pacemaker/1.1-pcs/html/Pacemaker_Remote/index.html
 After=network.target
+After=time-sync.target
 
 [Install]
 WantedBy=multi-user.target

diff --git a/mcp/pacemaker.service.in b/mcp/pacemaker.service.in
@@ -7,6 +7,7 @@ After=basic.target
 After=syslog.service
 After=rsyslog.service
 After=network.target
+After=time-sync.target
 After=corosync.service
 
 Requires=dbus.service