Diffusion Pacemaker eb28c3b158d9

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

Tags

None

Referenced Files

None

Subscribers

None

Description

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

Details

Provenance

Andrew Beekhof <andrew@beekhof.net>

Authored on Sep 6 2014, 6:33 PM

Parents

rP98d215d1c2c8: Merge pull request #576 from xiali/master
rPa9c45ec076f4: Test: cts: Correctly handle threading and journalctl commands that don't return…

Branches

Unknown

Tags

Unknown

Event Timeline

Merged Changes

98d215d1c2c8 Merge pull request #576 from xiali/master
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
4c92b7c31a34 Test : cts : change default cluster stack from openais to corosync
Author
Xia Li <xli@suse.com>
Browse Repository
No Audits
266d5c248471 Merge pull request #575 from gao-yan/conditionally-detect-conflicting-peer
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
ee78862057e1 Merge pull request #573 from inouekazu/set_env
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
f51c05d1ca2d Fix: cluster: Invoke crm_remove_conflicting_peer() only when the new node's…
Author
gao-yan
Browse Repository
No Audits
c95c737b563b Merge pull request #574 from inouekazu/fix_job
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
f03b3a938bc4 Low: mcp: Add 'stop on runlevel' to Upstart job
Author
inouekazu
Browse Repository
No Audits
8ce7d9e41cd8 Low: mcp: Avoid the error of modprobe in Upstart job
Author
inouekazu
Browse Repository
No Audits
78ff77a2f605 Low: mcp: set environment variable which the cluster-glue module needs
Author
inouekazu
Browse Repository
No Audits
46510fcd69fe Merge pull request #572 from davidvossel/services-refactor
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
cada57483c46 Low: services: Refector services os execute function
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits

Changes (5)

Path

Size

cts/

lib/

cluster/

services/

services_linux.c

mcp/

pacemaker.combined.upstart.in

rPeb28c3b158d9

cts/environment.py

Loading...

lib/cluster/membership.c

Loading...

lib/services/services_linux.c

Loading...

mcp/corosync.c

Loading...

mcp/pacemaker.combined.upstart.in

Loading...