1038309 - Fix bug where distributor type was being checked against the distributor id instead of the type id
Merge pull request #408 from pulp/barnabycourt-1038309

1038309 - Fix bug where distributor type was being checked against the d...
Move server based tests to the server directory
new workflow for atomic publish
added better error logging and fixed parent publish dir generation
Merge pull request #413 from pulp/barnabycourt-fix-rhel5-break

Move server based tests to the server directory
adding comments about timestamp directory
Merge branch 'jconnor-atomic-publish' of github.com:pulp/pulp_rpm into jconnor-atomic-publish
Merge branch 'jconnor-new-yum-distributor' into jconnor-atomic-publish

Conflicts:
	plugins/pulp_rpm/plugins/distributors/yum/publish.py
moved publish_to_master reporting to the constants module
Automatic commit of package [pulp-rpm] release [2.4.0-0.1.alpha].
fixed unit tests and bugs revealed by unit tests
always cleanup the working directory
Merge branch 'pulp-2.3'
removed superfluous logging and changed top-level logging to exception instead of debug
added unit tests for trailing slash
Merge pull request #418 from pulp/jconnor-atomic-publish

Jconnor atomic publish
Merge branch 'master' into jconnor-new-yum-distributor
removed old distributor
removed 1 more test for old distributor