Merge branch 'master' of github.com:pulp/pulp
removing 'permissions' from valid update keywords for role update, moving manager functionality out of authorization.py, removing duplicate declaration of permission operation constants in permission.py and adding missing unit tests
Merge branch 'master' of github.com:pulp/pulp
Remove parameters that forced pulp-rpm to run pulp tests
Raise version strings in all setup.py files to 2.4.0.
Merge branch 'master' of github.com:pulp/pulp
updating info about dependencies we build
Merge pull request #822 from pulp/barnabycourt-remove-unneccessary-nose-parameter

Remove unnecessary parameters from the nose test-runner
Merge branch 'rbarlow-setup_versions'
Reverting previous commit to prepend commit message with bug id.

This reverts commit 73db3b709417db4ac0e34819f59979917515a0c3.
1066040 - removing 'permissions' from valid update keywords for role update,
moving manager functionality out of authorization.py, removing duplicate declaration of permission operation
constants in permission.py and adding missing unit tests
Added documentation about pulp-admin authentication methods
add self to AUTHORS
Merge pull request #825 from stpierre/auth-docs

Auth docs
Add release notes about changes in the cancel API.

The Importer and Distributor cancellation APIs have changed in this
release. This commit adds release notes for plugin writers.
Update to amqp-1.4.4.
Automatic commit of package [python-amqp] minor release [1.4.4-1].
Merge branch 'rbarlow-cancellation_release_notes'
incorporating PR feedback
incorporating PR feedback