Diffusion Pacemaker fbc239b4f56d

Merge branch '1.1' of github.com:ClusterLabs/pacemaker into 1.1
fbc239b4f56d
Actions

Tags

None

Referenced Files

None

Subscribers

None

Description

Merge branch '1.1' of github.com:ClusterLabs/pacemaker into 1.1

Details

Provenance

Andrew Beekhof <andrew@beekhof.net>

Authored on May 10 2015, 8:33 PM

Parents

rPc9ad9cd503f0: Merge pull request #704 from gao-yan/sort_rsc_process_order
rP188337e5f6f2: Build: Another travis update

Branches

Unknown

Tags

Unknown

Event Timeline

Merged Changes

c9ad9cd503f0 Merge pull request #704 from gao-yan/sort_rsc_process_order
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
9470f07c91f8 Merge pull request #707 from kgaillot/onfail
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
e9fa44f3a0e5 Refactor: crmd/pengine: implement on-fail=ignore without allow-fail
Author
kgaillot
Browse Repository
No Audits
f59634af41f6 Fix: pengine: Prevent use-after-free in sort_rsc_process_order()
Author
gao-yan
Browse Repository
No Audits
091802e0ce31 Merge pull request #701 from gao-yan/rolling-upgrade-fence
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
b47d6e7f2191 Merge pull request #694 from kgaillot/bz1200849
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
be27fc8b87c6 Merge pull request #685 from kgaillot/fixes-1.1
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
ac6c932a86b2 Merge pull request #700 from gao-yan/acl-xsl
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
4e1438384f64 Fix: crmd: Prevent the old version of DC from being fenced when it shuts down…
Author
gao-yan
Browse Repository
No Audits
11b6be889460 Fix: xml: Fix upgrade-1.3.xsl to correctly transform ACL rules with "attribute"
Author
gao-yan
Browse Repository
No Audits
2c98d3706052 Fix: crmd/pengine: handle on-fail=ignore properly
Author
kgaillot
Browse Repository
No Audits
d0a7035d657c Refactor: crmd: get full action information earlier
Author
kgaillot
Browse Repository
No Audits
1efe282b9348 Refactor: crmd: rename action number variable in process_graph_event()
Author
kgaillot
Browse Repository
No Audits
77286458c14f Refactor: crmd: remove dead code
Author
kgaillot
Browse Repository
No Audits
055aa7fc8db5 Fix: crmd: respect start-failure-is-fatal even for artifically injected events
Author
kgaillot
Browse Repository
No Audits
ea70ac78c064 Fix: crmd: don't update fail count twice for same failure
Author
kgaillot
Browse Repository
No Audits
f4f14efb9035 Fix: crmd: report operation rc as advertised instead of status
Author
kgaillot
Browse Repository
No Audits
882c68f3f218 Refactor: crmd: use defined constant for magic "direct nack" RC
Author
kgaillot
Browse Repository
No Audits
d08a713f9d22 xml: add RelaxNG schema for crm_mon XML output
Author
kgaillot
Browse Repository
No Audits
c87411cbe0f4 Build: handle RNG versioning better in xml Makefile
Author
kgaillot
Browse Repository
No Audits

Changes (14)

Path

Size

crmd/

include/

crm/

pengine/

lib/

pengine/

pengine/

xml/

upgrade-1.3.xsl

rPfbc239b4f56d

crmd/callbacks.c

Loading...

crmd/fsa_defines.h

Loading...

crmd/lrm.c

Loading...

crmd/te_callbacks.c

Loading...

crmd/te_events.c

Loading...

include/crm/crm.h

Loading...

include/crm/msg_xml.h

Loading...

include/crm/pengine/status.h

Loading...

lib/pengine/utils.c

Loading...

pengine/allocate.c

Loading...

pengine/graph.c

Loading...

xml/Makefile.am

Loading...

xml/crm_mon.rng

Loading...

xml/upgrade-1.3.xsl

Loading...