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

Description

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

Details

Provenance

Authored on Mar 6 2013, 9:56 PM

Parents

rP38b4f4272d32: Merge pull request #251 from davidvossel/pacemaker_remote
rP63ff6c69393d: Merge branch 'master' of github.com:beekhof/pacemaker

Branches

Unknown

Tags

Unknown

Event Timeline

Merged Changes

38b4f4272d32 Merge pull request #251 from davidvossel/pacemaker_remote
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
daaf94f39e38 Low: remote: Code review cleanup
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
e443258ff093 Low: sysconfig: Pacemaker remote environment variables
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
0bd15e92eb0d Low: spec: pacemaker does not require pacemaker_remote package
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
f6afc1120a72 Low: remote: Downgrade timeout error msg to debug
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
0f77bca9c495 High: remote: Pacemaker remote protocol versioning
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
e2103e923709 High: remote: Add stonith ipc passthrough to pacemaker_remote
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
e5efc28247e5 Low: remote: Package sysconfig file with pacemaker_remote
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
1debe126adb2 Feature: Pacemaker Remote Daemon for extending pacemaker functionality outside…
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
af312955005e Merge pull request #236 from gao-yan/route-ais-message
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
7f5c7c6537a5 Fix: ais: Prevent assertion failure on routing ais messages (bnc#805626)
Author
gao-yan
Browse Repository
No Audits

Changes (20)

Path

Size

configure.ac

fencing/

main.c

include/

crm/

cib/

internal.h

lrmd.h

crm_internal.h

lib/

ais/

cib/

common/

lrmd/

lrmd/

	pacemaker_remote.service.in
	lrm.service.in

tls_backend.c

mcp/

pacemaker.sysconfig

pacemaker.spec.in

rP4a9da1dd8d3c

View Options

configure.ac

View Options

fencing/main.c

View Options

include/crm/cib/internal.h

View Options

include/crm/lrmd.h

View Options

include/crm_internal.h

View Options

lib/ais/plugin.c

View Options

lib/cib/cib_utils.c

View Options

lib/common/remote.c

View Options

lib/common/utils.c

View Options

lib/lrmd/lrmd_client.c

View Options

lrmd/Makefile.am

View Options

lrmd/ipc_proxy.c

View Options

lrmd/lrm.service.in

View Options

lrmd/lrmd.c

View Options

lrmd/lrmd_private.h

View Options

lrmd/main.c

View Options

lrmd/pacemaker_remote.service.in

View Options

lrmd/tls_backend.c

View Options

mcp/pacemaker.sysconfig

View Options

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

Description

Details

Event Timeline

Merged Changes

Changes (20)

rP4a9da1dd8d3c

configure.ac

fencing/main.c

include/crm/cib/internal.h

include/crm/lrmd.h

include/crm_internal.h

lib/ais/plugin.c

lib/cib/cib_utils.c

lib/common/remote.c

lib/common/utils.c

lib/lrmd/lrmd_client.c

lrmd/Makefile.am

lrmd/ipc_proxy.c

lrmd/lrm.service.in

lrmd/lrmd.c

lrmd/lrmd_private.h

lrmd/main.c

lrmd/pacemaker_remote.service.in

lrmd/tls_backend.c

mcp/pacemaker.sysconfig

pacemaker.spec.in

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