Diffusion Pacemaker 9abc761198e6

Merge branch 'master' of github.com:ClusterLabs/pacemaker
9abc761198e6
Actions

Tags

None

Referenced Files

None

Subscribers

None

Description

Merge branch 'master' of github.com:ClusterLabs/pacemaker

Conflicts:
include/crm/lrmd.h

Details

Provenance

Andrew Beekhof <andrew@beekhof.net>

Authored on Jul 1 2012, 6:46 PM

Parents

rP5081b1e2ef5d: Merge pull request #98 from davidvossel/bug-5072
rPd873adcdbdf6: Low: Tools: Update the regression tests for the new error codes and text

Branches

Unknown

Tags

Unknown

Event Timeline

Merged Changes

5081b1e2ef5d Merge pull request #98 from davidvossel/bug-5072
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
23aae708e50e Merge pull request #97 from t-matsuo/disable-systemd-patch
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
fc03be02bf3a High: pengine: cl#5072 - Fixes monitor op stopping after rsc promotion.
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
b4c1afdb494d High: lrmd: cl#5072 - Keep notify ops out of CIB.
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
a6245ad3ac27 Low: services: Fix compile error when not using systemd
Author
Takatoshi MATSUO <matsuo.tak@gmail.com>
Browse Repository
No Audits
1f2cdae0b6e0 Merge pull request #96 from davidvossel/systemd_upstart_cleanup
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
5a84b1e740f8 Merge pull request #94 from davidvossel/lrmd_regression_tests
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
8f487b2cb4c5 Merge pull request #91 from davidvossel/lrmd_coverity_fixes
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
66999b332b3d Medium: services: Fixes memory leaks and freeing uninitialized memory errors
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
c6c9cdfd4883 Low: lrmd: Adds ability to run lrmd test outside of source tree.
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
d99669296835 Merge pull request #93 from davidvossel/lrmd_err2txt
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
335761e979e4 Low: lrmd: Lrmd api error code to string function
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
f25ac51a791d Low: lrmd: Fixes issues reported by coverity
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits

Changes (8)

Path

Size

crmd/

lib/

pengine/

services/

services_linux.c

lrmd/

rP9abc761198e6

crmd/lrm.c

Loading...

lib/pengine/unpack.c

Loading...

lib/services/services.c

Loading...

lib/services/services_linux.c

Loading...

lib/services/systemd.c

Loading...

lib/services/upstart.c

Loading...

lrmd/lrmd.c

Loading...

lrmd/regression.py

Loading...