Automatic commit of package [pulp] release [pulp-2.3.1-0.5.beta].
Automatic commit of package [pulp-nodes] release [pulp-2.3.1-0.5.beta].
1039619 - update output to account for qpidd.conf location changing in qpid 0.24
Merge commit '181cdd2a1b8155882a416ba04ed9b5cc07aca8c8'
update spec files to fix version
merge changes foreward
Automatic commit of package [pulp] release [2.3.1-0.6.beta].
Automatic commit of package [pulp-nodes] release [2.3.1-0.6.beta].
Merge (-s ours) pulp-2.3 => master, post-build
Merge pull request #744 from pulp/jortel-1039619

1039619 - update output to account for qpidd.conf location changing in qpid 0.24
Merge branch 'jortel-1039619' into pulp-2.3
Merge branch 'pulp-2.3'
Automatic commit of package [pulp] release [2.3.1-0.7.beta].
Automatic commit of package [pulp-nodes] release [2.3.1-0.7.beta].
Merge (-s ours) pulp-2.3 => master, post-build
purge agenthub support.
Merge branch 'jortel-agenthub' into distributed-tasks
Merge branch 'distributed-tasks' into jortel-distributed-tasks

Conflicts:
	server/test/unit/test_agent.py