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

Description

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

Details

Provenance

Authored on Apr 9 2014, 6:56 PM

Parents

rPb712d6d19735: Merge pull request #494 from davidvossel/master
rPfa8bd56b776b: Fix: lrmd: Expose logging variables expected by OCF agents

Branches

Unknown

Tags

Unknown

Event Timeline

Merged Changes

b712d6d19735 Merge pull request #494 from davidvossel/master
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
00ee10ad3298 Merge pull request #493 from davidvossel/unfencing_fixes
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
4c5d5067be61 Fix: pengine: Correctly search failcount (for real this time)
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
48a18541f050 Fix: fencing: properly detect new fencing devices for v2 cib updates
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
31125e36e8d6 Low: fencing: Set 'on_target=true' for fence_dummy to allow testing unfencing
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
7f96b00ff66c Merge pull request #420 from inouekazu/get_failcount_by_prefix
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
6442c5a67cdd Merge pull request #425 from gao-yan/nvpair-id-ref
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
b42ab477b6c1 Merge pull request #492 from davidvossel/master
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
6bbc4fc6637e Build: remove bc from spec and travis file
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
9077dde4ae24 Test: pengine: Support id-ref in nvpair with optional "name"
Author
gao-yan
Browse Repository
No Audits
3912538a8954 Feature: pengine: Support id-ref in nvpair with optional "name"
Author
gao-yan
Browse Repository
No Audits
cd7864fed977 Fix: pengine: Correctly search failcount
Author
inouekazu
Browse Repository
No Audits

Changes (15)

Path

Size

.travis.yml

fencing/

fence_dummy

main.c

lib/

pengine/

pengine/

test10/

	nvpair-id-ref.dot
	template-1.dot

	nvpair-id-ref.exp
	probe-timeout.exp

	nvpair-id-ref.scores
	node-maintenance-2.scores

	nvpair-id-ref.summary
	template-1.summary

	nvpair-id-ref.xml
	ticket-primitive-1.xml

xml/

nodes-1.3.rng

	nvset-1.3.rng
	nvset.rng

resources-1.3.rng

rP4490287e3313

View Options

.travis.yml

View Options

fencing/fence_dummy

View Options

fencing/main.c

View Options

lib/pengine/rules.c

View Options

lib/pengine/utils.c

View Options

pacemaker.spec.in

View Options

pengine/regression.sh

View Options

pengine/test10/nvpair-id-ref.dot

View Options

pengine/test10/nvpair-id-ref.exp

View Options

pengine/test10/nvpair-id-ref.scores

View Options

pengine/test10/nvpair-id-ref.summary

View Options

pengine/test10/nvpair-id-ref.xml

View Options

xml/nodes-1.3.rng

View Options

xml/nvset-1.3.rng

View Options

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

Description

Details

Event Timeline

Merged Changes

Changes (15)

rP4490287e3313

.travis.yml

fencing/fence_dummy

fencing/main.c

lib/pengine/rules.c

lib/pengine/utils.c

pacemaker.spec.in

pengine/regression.sh

pengine/test10/nvpair-id-ref.dot

pengine/test10/nvpair-id-ref.exp

pengine/test10/nvpair-id-ref.scores

pengine/test10/nvpair-id-ref.summary

pengine/test10/nvpair-id-ref.xml

xml/nodes-1.3.rng

xml/nvset-1.3.rng

xml/resources-1.3.rng

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