Automatic commit of package [pulp] release [2.4.2-1].
Automatic commit of package [pulp-nodes] release [2.4.2-1].
Merge remote-tracking branch 'origin/2.4-release' into 2.4-testing

Conflicts:
	nodes/pulp-nodes.spec
	pulp.spec
	rel-eng/packages/pulp
	rel-eng/packages/pulp-nodes
Merge remote-tracking branch 'origin/2.4-testing' into 2.4-dev
Merge remote-tracking branch 'origin/2.4-dev' into 2.5-testing

Conflicts:
	nodes/pulp-nodes.spec
	pulp.spec
	rel-eng/packages/pulp
	rel-eng/packages/pulp-nodes
Merge remote-tracking branch 'origin/2.5-testing' into 2.5-dev