Diffusion Pacemaker 0bc2eb57294c

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

Tags

None

Referenced Files

None

Subscribers

None

Description

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

Conflicts:
xml/pacemaker-1.2.rng
xml/pacemaker-next.rng

Details

Provenance

Andrew Beekhof <andrew@beekhof.net>

Authored on Apr 3 2014, 11:05 PM

Parents

rP6f354242e5a7: Merge pull request #476 from krig/crm_attribute_node
rP69c8d227c605: Fix: crmd: Correctly react to successful unfencing operations

Branches

Unknown

Tags

Unknown

Event Timeline

Merged Changes

6f354242e5a7 Merge pull request #476 from krig/crm_attribute_node
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
0e68800eba62 Merge pull request #479 from gao-yan/corosync-logging
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
cb8bfed141a6 Merge pull request #473 from jnpkrn/integer-overflow
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
63019f6ba4ed Merge pull request #478 from gao-yan/attrd-logging
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
5060b872ec4f Merge pull request #485 from HideoYamauchi/master
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
4eab42108e4f Merge pull request #488 from davidvossel/container-node-migrate
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
547e2dff9f33 Low: pengine: update regression tests to reflect summary fix
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
92177492dbd2 Low: pengine: Only report 'migrate' in transition summary if migration is…
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
6ba46f27e1da Merge pull request #481 from inouekazu/case_sensitive
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
3fc62c85686b Merge pull request #487 from davidvossel/free_correctly_vos
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
363dc3f57ff9 Loq: crm_node: Set correct subsystem in node rm cache msg
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
0ce7696434f7 Fix: crm_node: Prevent use-after-free in tools_remove_node_cache()
Author
inouekazu
Browse Repository
No Audits
99099e0e7cb0 Merge pull request #484 from krig/crm_report-iso8601
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
8c47b01d5e84 Correction of the registration from a difference.
Author
HideoYamauchi
Browse Repository
No Audits
dec9370f97f0 crm_report: Add support for ISO8601 time format in logs
Author
Kristoffer Grönlund <krig@koru.se>
Browse Repository
No Audits
2b13da617286 Merge pull request #472 from oallart/master
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
50c346eeedf5 Merge pull request #477 from yuusuke/fix_crm_mon
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
6afc640b3edd Fix: crmd: make node_state erase correctly
Author
inouekazu
Browse Repository
No Audits
d63eaf41fa81 Merge pull request #467 from davidvossel/remote-node-attr
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
e9ed8a2afe89 Low: pengine: Regression test for stale leftover remote-node <node> entries
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
2f4cb8389c7f Low: pengine: Do not fence remote-node entries left over in the node section…
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
77c7ad691303 Low: cts: test setting/removing remote-node permanent attributes
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
1420ff88be2e Low: pengine: properly handle remote-node without connection resource.
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
a010b5110c50 High: xml: Update xml validation to allow '<node type=remote />'
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
0acbd87ce431 High: cib: allow setting permanent remote-node attributes
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
c2100478bc17 Low: crm_get_msec: prevent integer overflow
Author
Jan Pokorný <jpokorny@redhat.com>
Browse Repository
No Audits
b098f3d3cb1b Log: corosync: Reduce log severity for a redundant message
Author
gao-yan
Browse Repository
No Audits
2bcb811c59f9 Log: attrd: Reduce log severity for normal messages
Author
gao-yan
Browse Repository
No Audits
962e7d479714 Fix: When data was old, it fixed so that the newest cib might not be acquired.
Author
yuusuke <yusk.iida@gmail.com>
Browse Repository
No Audits
056926c1c389 crm_attribute: Default --lifetime to forever when using --node
Author
Kristoffer Grönlund <krig@koru.se>
Browse Repository
No Audits
7f80c422426e fix: pcs-crmsh-quick-ref.md: rsc ban,move,clear
Author
Olivier Allart <olivier.allart@eyecon.com.au>
Browse Repository
No Audits
5210b6b7b007 fix: pcs-crmsh-quick-ref.md: Constraints manipulation
Author
Olivier Allart <olivier.allart@eyecon.com.au>
Browse Repository
No Audits

Changes (35)

Path

Size

attrd/

crmd/

cts/

doc/

pcs-crmsh-quick-ref.md

fencing/

include/

crm/

cib/

compatibility.h

lib/

cib/

cluster/

common/

pengine/

pengine/

test10/

11-a-then-bm-b-move-a-clone-starting.summary

5-am-then-bm-a-not-migratable.summary

7-migrate-group-one-unmigratable.summary

9-am-then-bm-b-migrating-a-stopping.summary

migrate-partial-4.summary

remote-stale-node-entry.dot

remote-stale-node-entry.exp

remote-stale-node-entry.scores

remote-stale-node-entry.summary

remote-stale-node-entry.xml

tools/

crm_attribute.c

report.common.in

rP0bc2eb57294c

attrd/commands.c

Loading...

attrd/legacy.c

Loading...

crmd/corosync.c

Loading...

crmd/election.c

Loading...

crmd/lrm.c

Loading...

crmd/te_actions.c

Loading...

cts/CTStests.py

Loading...

doc/pcs-crmsh-quick-ref.md

Loading...

fencing/main.c

Loading...

include/crm/cib/util.h

Loading...

include/crm/compatibility.h

Loading...

lib/cib/cib_attrs.c

Loading...

lib/cib/cib_utils.c

Loading...

lib/cluster/corosync.c

Loading...

lib/common/utils.c

Loading...

lib/pengine/unpack.c

Loading...

lib/pengine/utils.c

Loading...

pengine/graph.c

Loading...

pengine/native.c

Loading...

pengine/regression.sh

Loading...

pengine/test10/11-a-then-bm-b-move-a-clone-starting.summary

Loading...

pengine/test10/5-am-then-bm-a-not-migratable.summary

Loading...

pengine/test10/7-migrate-group-one-unmigratable.summary

Loading...

pengine/test10/9-am-then-bm-b-migrating-a-stopping.summary

Loading...

pengine/test10/migrate-partial-4.summary

Loading...

pengine/test10/remote-stale-node-entry.dot

Loading...

pengine/test10/remote-stale-node-entry.exp

Loading...

pengine/test10/remote-stale-node-entry.scores

Loading...

pengine/test10/remote-stale-node-entry.summary

Loading...

pengine/test10/remote-stale-node-entry.xml

Loading...

tools/crm_attribute.c

Loading...

tools/crm_mon.c

Loading...

tools/crm_node.c

Loading...

tools/crm_resource.c

Loading...

tools/report.common.in

Loading...