Merge branch '1.1' of github.com:ClusterLabs/pacemaker into 1.1
ef60ba6e3243
Actions

Description

Merge branch '1.1' of github.com:ClusterLabs/pacemaker into 1.1

Conflicts:
lib/common/xml.c
lib/pengine/unpack.c
lib/services/dbus.c
lib/services/systemd.c
lib/services/upstart.c
pengine/native.c
pengine/test10/migrate-partial-4.exp

Details

Provenance

Andrew Beekhof <andrew@beekhof.net>

Authored on May 7 2014, 11:10 PM

Parents

rP9d39a6b5380c: Low: changelog: Update changelog for 1.1.11 release
rPcbb4a069375f: Merge with devel

Branches

Unknown

Tags

Unknown

Event Timeline

Merged Changes

9d39a6b5380c Low: changelog: Update changelog for 1.1.11 release
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
33f9d09b3eac Low: services: fix building dbus support in buildbot.
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
251410236a33 Low: services: Fix building dbus
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
f889884c2d4d Low: services: Keep dbus build support optional
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
6d0eaa01fe36 Refactor: dbus: Use native function for adding arguments to messages
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
6b24c5c909eb Fix: Bug rhbz#1057697 - Use native DBus library for upstart support to avoid…
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
95da3ba05e74 Fix: Portability: Use basic types for DBus compatability struct
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
e902baf4acc4 Build: Add dbus as an rpm dependancy
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
1d3da769dc6e Refactor: systemd: Simplify dbus API usage
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
d179f0097459 Fix: Bug rhbz#1057697 - Use native DBus library for systemd async support to…
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
2ebaac9e82b5 Fix: Bug rhbz#1057697 - Use native DBus library for systemd support to avoid…
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
3527db18af56 Low: pengine: Regression test update for record-pending=true on migrate_to
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
82871037625e Fix: xml: Fix segfault in find_entity()
Author
gao-yan
Browse Repository
No Audits
39366d3fac13 Fix: cib: Fix remote cib based on TLS
Author
gao-yan
Browse Repository
No Audits
0c8b584c7fed High: services: Do not block synced service executions
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
15bd8d82aacf Fix: cluster: Fix segfault on removing a node
Author
gao-yan
Browse Repository
No Audits
fac99dd3fd7c Fix: services: Reset the scheduling policy and priority for lrmd's children…
Author
gao-yan
Browse Repository
No Audits
d4a0935103de Fix: services: Correctly reset the nice value for lrmd's children
Author
gao-yan
Browse Repository
No Audits
38c291ee2e5f High: pengine: Force record pending for migrate_to actions
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
7f1fe8a3c54a High: pengine: cl#5186 - Avoid running rsc on two nodes when node is fenced…
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
f2d0cbcd82aa Fix: stonith_admin: Ensure pointers passed to sscanf() are properly initialized
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
e5f35498a2aa Fix: Prevent potential use-of-NULL
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
1b3954e7560e Fix: upstart: Allow comilation with glib versions older than 2.28
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
bade296e554b Fix: services: Fixes segfault associated with cancelling in-flight recurring…
Author
inouekazu
Browse Repository
No Audits
99f6d9fd7349 Low: crmd: Change the default value of node-action-limit
Author
inouekazu
Browse Repository
No Audits

Empty Commit

This commit is empty and does not affect any paths.