1060752 - Add sample output for repo import_upload
Fix the line wrapping
update to set proper header on request body
Merge pull request #1212 from pulp/barnabycourt-1060752

1060752 - Add sample output for repo import_upload
Merge pull request #1219 from pulp/barnabycourt-fix-line-wrapping

Fix the line wrapping
Automatic commit of package [pulp] release [2.4.2-0.1.beta].
Automatic commit of package [pulp-nodes] release [2.4.2-0.1.beta].
Merge remote-tracking branch 'origin/2.4-testing' into 2.4-dev

Conflicts:
	pulp.spec
Automatic commit of package [pulp] release [2.5.0-0.8.beta].
Automatic commit of package [pulp-nodes] release [2.5.0-0.8.beta].
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
Automatic commit of package [pulp] release [2.4.2-1].
Automatic commit of package [pulp-nodes] release [2.4.2-1].
1150297 - Update versions from 2.4.x to 2.5.0.

https://bugzilla.redhat.com/show_bug.cgi?id=1150297
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
Adds troubleshooting note on celery pickle warning
Merge pull request #1232 from bmbouter/add-pickle-celery-warning-troubleshooting-note

Adds troubleshooting note on celery pickle warning
Adds tcp_socket shutdown to pulp-celery SELinux modle