Diffusion Pacemaker 47636f094d0f

Merge branch 'master' of github.com:ClusterLabs/pacemaker
47636f094d0f
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 Feb 5 2014, 5:31 PM

Parents

rPc5d909ee14fd: Merge pull request #431 from davidvossel/doc_updates
rP5c8c7a5277da: Test: lrmd: Kill uninstalled daemons by the correct name

Branches

Unknown

Tags

Unknown

Event Timeline

Merged Changes

c5d909ee14fd Merge pull request #431 from davidvossel/doc_updates
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
7033570270aa Low: doc: Update pacemaker_remote future features documentation
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
308a1c0c0832 Low: doc: Update distro documented for pacemaker_remote
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
bc2dcf83d093 Low: doc: Document use of pcs to configure corosync config
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
31b977fb8d46 Low: doc: Fix pacemaker_remote baremetal documentation index table.
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
bc3314a4cf99 Merge pull request #430 from davidvossel/new_migration_logic
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
02b7d5a30bc1 Medium: remote: Fail remote-node connection rsc monitor ops early on unexpected…
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
dee8362f4bdf Low: remote: Remove redundant code
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
21de3a089572 Merge pull request #429 from davidvossel/new_migration_logic
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
b1e3a7eac2c4 Low: tools: Return error when attempting to delete an unspecified attribute
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
aea74397ef8a High: remote: Allow baremetal remote-node connection resources to migrate
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
87f40917feb5 Low: lrmd: Send event alerting estabilished clients that a new client…
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
a6ae9f300959 Merge pull request #428 from krig/doc-update
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
29f2eed5bb79 Doc: Update pcs/crmsh quick reference
Author
Kristoffer Grönlund <krig@koru.se>
Browse Repository
No Audits
7963907fe0b3 Merge pull request #426 from gao-yan/xml-segfault
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
dd105a6fd1cb Fix: xml: Fix segfault in find_entity()
Author
gao-yan
Browse Repository
No Audits
f3eeaf49d1fb Merge pull request #424 from davidvossel/master
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
8675dc9671e4 Low: pengine: Free memory allocated by find_actions()
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
5e9769cc63df Merge pull request #423 from gao-yan/remote-cib-tls
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
fe61ad058699 Fix: cib: Fix remote cib based on TLS
Author
gao-yan
Browse Repository
No Audits
96cd1941308b Merge pull request #421 from davidvossel/service_nonblock
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
b0ab1ccdb55d High: services: Do not block synced service executions
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
a3cda7619e71 Merge pull request #417 from krig/grep-text
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
cc9e625d7f8e Low: crm_report: Force grep to interpret logs as text
Author
Kristoffer Grönlund <krig@koru.se>
Browse Repository
No Audits
31d76eedee4a Merge pull request #414 from gao-yan/services-reset-scheduling
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
b913a2125a40 Merge pull request #416 from davidvossel/new_migration_logic
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
93f40ef4ed45 Low: pengine: Regression test to handle partial migration with src node losing…
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
3c93046af939 Low: pengine: Update regression tests for record pending on migrate_to
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
9227149abe87 High: pengine: Force record pending for migrate_to actions
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
64dc38bc3e8b High: pengine: cl#5186 - Avoid running rsc on two nodes when node is fenced…
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
a21e2a2c09c9 Merge pull request #415 from gao-yan/remove-node-segfault
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
fad35fd71059 Fix: cluster: Fix segfault on removing a node
Author
gao-yan
Browse Repository
No Audits
cfb8dcbcb0a6 Fix: services: Reset the scheduling policy and priority for lrmd's children…
Author
gao-yan
Browse Repository
No Audits
0b231c1aa8bc Merge pull request #413 from gao-yan/fencing-update-device
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
15fb3e0651d9 Fix: fencing: Update stonith device list only if stonith is enabled
Author
gao-yan
Browse Repository
No Audits
ae6b221c41a7 Merge pull request #412 from gao-yan/lrmd-children-reset-nice
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
fa8f1a55c81c Merge pull request #410 from davidvossel/stonith_timeout_fix
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
4f766cf74585 Fix: services: Correctly reset the nice value for lrmd's children
Author
gao-yan
Browse Repository
No Audits
0f1769854c72 Merge pull request #411 from davidvossel/master
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
b578680e4a16 Medium: pengine: Correctly perform partial migrations when node's uname is not…
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
5120b8659ea7 Low: fencing: Immediately fail remote fencing operation on peer timeout
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
b48276babcfe Merge pull request #401 from davidvossel/new_migration_logic
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
886901b1b638 Low: new migration logic advanced test cases
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
d80a722f2731 Low: updated pengine regression tests for improved migration support
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
95806dc1eadf High: cl#5055: Improved migration support.
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits

Changes (158)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

Path

Size

crmd/

remote_lrmd_ra.c

doc/

Pacemaker_Remote/

en-US/

Ch-Baremetal-Tutorial.txt

Ch-KVM-Tutorial.txt

Ch-LXC-Tutorial.txt

Pacemaker_Remote.ent

pcs-crmsh-quick-ref.md

fencing/

include/

crm/

pengine/

lib/

ais/

cib/

cluster/

common/

lrmd/

pengine/

services/

services_linux.c

lrmd/

pengine/

test10/

1-a-then-bm-move-b.dot

1-a-then-bm-move-b.exp

1-a-then-bm-move-b.scores

1-a-then-bm-move-b.summary

1-a-then-bm-move-b.xml

10-a-then-bm-b-move-a-clone.dot

10-a-then-bm-b-move-a-clone.exp

10-a-then-bm-b-move-a-clone.scores

10-a-then-bm-b-move-a-clone.summary

10-a-then-bm-b-move-a-clone.xml

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

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

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

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

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

2-am-then-b-move-a.dot

2-am-then-b-move-a.exp

2-am-then-b-move-a.scores

2-am-then-b-move-a.summary

2-am-then-b-move-a.xml

3-am-then-bm-both-migrate.dot

3-am-then-bm-both-migrate.exp

3-am-then-bm-both-migrate.scores

3-am-then-bm-both-migrate.summary

3-am-then-bm-both-migrate.xml

4-am-then-bm-b-not-migratable.dot

4-am-then-bm-b-not-migratable.exp

4-am-then-bm-b-not-migratable.scores

4-am-then-bm-b-not-migratable.summary

4-am-then-bm-b-not-migratable.xml

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

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

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

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

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

6-migrate-group.dot

6-migrate-group.exp

6-migrate-group.scores

6-migrate-group.summary

6-migrate-group.xml

7-migrate-group-one-unmigratable.dot

7-migrate-group-one-unmigratable.exp

7-migrate-group-one-unmigratable.scores

7-migrate-group-one-unmigratable.summary

7-migrate-group-one-unmigratable.xml

8-am-then-bm-a-migrating-b-stopping.dot

8-am-then-bm-a-migrating-b-stopping.exp

8-am-then-bm-a-migrating-b-stopping.scores

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

8-am-then-bm-a-migrating-b-stopping.xml

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

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

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

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

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

bug-1820-1.summary

bug-1820.summary

bug-5186-partial-migrate.dot

bug-5186-partial-migrate.exp

bug-5186-partial-migrate.scores

bug-5186-partial-migrate.summary

bug-5186-partial-migrate.xml

coloc-clone-stays-active.dot

coloc-clone-stays-active.exp

group-dependants.dot

group-dependants.exp

group-dependants.summary

load-stopped-loop.dot

load-stopped-loop.exp

migrate-5.summary

migrate-begin.dot

migrate-begin.exp

migrate-both-vms.dot

migrate-both-vms.exp

migrate-both-vms.summary

migrate-fencing.dot

migrate-fencing.exp

migrate-partial-2.dot

migrate-partial-2.exp

migrate-partial-2.summary

migrate-partial-4.dot

migrate-partial-4.exp

migrate-partial-4.summary

migrate-start-complex.dot

migrate-start-complex.exp

migrate-start.dot

migrate-start.exp

migrate-stop-complex.dot

migrate-stop-complex.exp

migrate-stop-complex.summary

migrate-stop-start-complex.dot

migrate-stop-start-complex.exp

migrate-stop-start-complex.summary

migrate-stop.dot

migrate-stop.exp

migrate-stop.summary

migrate-stop_start.dot

migrate-stop_start.exp

migrate-stop_start.summary

novell-252693-2.dot

novell-252693-2.exp

novell-252693-3.dot

novell-252693-3.exp

novell-252693-3.summary

novell-252693.dot

novell-252693.exp

novell-252693.summary

order-serialize-set.dot

order-serialize-set.exp

order-serialize-set.summary

order-serialize.dot

order-serialize.exp

order-serialize.summary

utilization-order3.dot

utilization-order3.exp

utilization-order4.dot

utilization-order4.exp

tools/

crm_attribute.c

report.common.in

rP47636f094d0f

crmd/remote_lrmd_ra.c

doc/Pacemaker_Remote/en-US/Ch-Baremetal-Tutorial.txt

doc/Pacemaker_Remote/en-US/Ch-Future.txt

doc/Pacemaker_Remote/en-US/Ch-KVM-Tutorial.txt

doc/Pacemaker_Remote/en-US/Ch-LXC-Tutorial.txt

doc/Pacemaker_Remote/en-US/Pacemaker_Remote.ent

doc/pcs-crmsh-quick-ref.md

fencing/main.c

fencing/remote.c

include/crm/lrmd.h

include/crm/pengine/complex.h

include/crm/pengine/status.h

lib/ais/utils.c

lib/cib/cib_remote.c

lib/cluster/membership.c

lib/common/xml.c

lib/lrmd/lrmd_client.c

lib/pengine/complex.c

lib/pengine/unpack.c

lib/services/services_linux.c

lrmd/lrmd.c

lrmd/lrmd_private.h

lrmd/main.c

lrmd/tls_backend.c

pengine/allocate.c

pengine/allocate.h

pengine/clone.c

pengine/constraints.c

pengine/graph.c

pengine/native.c

pengine/regression.sh

pengine/test10/1-a-then-bm-move-b.dot

pengine/test10/1-a-then-bm-move-b.exp

pengine/test10/1-a-then-bm-move-b.scores

pengine/test10/1-a-then-bm-move-b.summary

pengine/test10/1-a-then-bm-move-b.xml

pengine/test10/10-a-then-bm-b-move-a-clone.dot

pengine/test10/10-a-then-bm-b-move-a-clone.exp

pengine/test10/10-a-then-bm-b-move-a-clone.scores

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

pengine/test10/10-a-then-bm-b-move-a-clone.xml

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

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

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

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

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

pengine/test10/2-am-then-b-move-a.dot

pengine/test10/2-am-then-b-move-a.exp

pengine/test10/2-am-then-b-move-a.scores

pengine/test10/2-am-then-b-move-a.summary

pengine/test10/2-am-then-b-move-a.xml

pengine/test10/3-am-then-bm-both-migrate.dot

pengine/test10/3-am-then-bm-both-migrate.exp

pengine/test10/3-am-then-bm-both-migrate.scores

pengine/test10/3-am-then-bm-both-migrate.summary

pengine/test10/3-am-then-bm-both-migrate.xml

pengine/test10/4-am-then-bm-b-not-migratable.dot

pengine/test10/4-am-then-bm-b-not-migratable.exp

pengine/test10/4-am-then-bm-b-not-migratable.scores

pengine/test10/4-am-then-bm-b-not-migratable.summary

pengine/test10/4-am-then-bm-b-not-migratable.xml

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

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

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

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

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

pengine/test10/6-migrate-group.dot

pengine/test10/6-migrate-group.exp

pengine/test10/6-migrate-group.scores

pengine/test10/6-migrate-group.summary

pengine/test10/6-migrate-group.xml

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

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

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

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

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

pengine/test10/8-am-then-bm-a-migrating-b-stopping.dot

pengine/test10/8-am-then-bm-a-migrating-b-stopping.exp

pengine/test10/8-am-then-bm-a-migrating-b-stopping.scores

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

pengine/test10/8-am-then-bm-a-migrating-b-stopping.xml

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

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

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

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

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

pengine/test10/bug-1820-1.dot

pengine/test10/bug-1820-1.exp

pengine/test10/bug-1820-1.summary

pengine/test10/bug-1820.dot

pengine/test10/bug-1820.exp

pengine/test10/bug-1820.summary

pengine/test10/bug-5186-partial-migrate.dot

pengine/test10/bug-5186-partial-migrate.exp

pengine/test10/bug-5186-partial-migrate.scores

pengine/test10/bug-5186-partial-migrate.summary

pengine/test10/bug-5186-partial-migrate.xml

pengine/test10/coloc-clone-stays-active.dot

pengine/test10/coloc-clone-stays-active.exp

pengine/test10/group-dependants.dot

pengine/test10/group-dependants.exp

pengine/test10/group-dependants.summary

pengine/test10/load-stopped-loop.dot

pengine/test10/load-stopped-loop.exp

pengine/test10/migrate-1.dot

pengine/test10/migrate-1.exp

pengine/test10/migrate-5.dot

pengine/test10/migrate-5.exp

pengine/test10/migrate-5.summary

pengine/test10/migrate-begin.dot

pengine/test10/migrate-begin.exp

pengine/test10/migrate-both-vms.dot

pengine/test10/migrate-both-vms.exp

pengine/test10/migrate-both-vms.summary

pengine/test10/migrate-fencing.dot

pengine/test10/migrate-fencing.exp

pengine/test10/migrate-partial-2.dot

pengine/test10/migrate-partial-2.exp

pengine/test10/migrate-partial-2.summary

pengine/test10/migrate-partial-4.dot

pengine/test10/migrate-partial-4.exp

pengine/test10/migrate-partial-4.summary

pengine/test10/migrate-start-complex.dot

pengine/test10/migrate-start-complex.exp

pengine/test10/migrate-start.dot

pengine/test10/migrate-start.exp

pengine/test10/migrate-stop-complex.dot

pengine/test10/migrate-stop-complex.exp

pengine/test10/migrate-stop-complex.summary

pengine/test10/migrate-stop-start-complex.dot

pengine/test10/migrate-stop-start-complex.exp

pengine/test10/migrate-stop-start-complex.summary

pengine/test10/migrate-stop.dot

pengine/test10/migrate-stop.exp

pengine/test10/migrate-stop.summary

pengine/test10/migrate-stop_start.dot

pengine/test10/migrate-stop_start.exp

pengine/test10/migrate-stop_start.summary

pengine/test10/novell-252693-2.dot

pengine/test10/novell-252693-2.exp

pengine/test10/novell-252693-3.dot

pengine/test10/novell-252693-3.exp

pengine/test10/novell-252693-3.summary

pengine/test10/novell-252693.dot

pengine/test10/novell-252693.exp

pengine/test10/novell-252693.summary

pengine/test10/order-serialize-set.dot

pengine/test10/order-serialize-set.exp

pengine/test10/order-serialize-set.summary

pengine/test10/order-serialize.dot

pengine/test10/order-serialize.exp

pengine/test10/order-serialize.summary

pengine/test10/utilization-order3.dot

pengine/test10/utilization-order3.exp

pengine/test10/utilization-order4.dot

pengine/test10/utilization-order4.exp

tools/crm_attribute.c

tools/report.common.in