1155604 - fixing incorrect formatting of a note
Update 2.5.x.rst

Add upgrade instructions:
 - run pulp-manage-db script
 - restart pulp services and httpd
PEP-8 pulp.server.managers.consumer.group.query.

Also PEP-8 its test module.
PEP-8 pulp.server.db.manage and its tests.
PEP-8 tests for pulp.server.managers.resources.
Merge pull request #1411 from VuokkoVuorinnen/patch-1

Update 2.5.x.rst
Build updates for Fedora 21.

This adds fc21 and removes fc19 from the 2.6 build. There are also two small
specfile fixes.
PEP-8 tests for pulp.server.db.model.resources.
update dev setup docs

Some steps were broken and/or not needed anymore due to changes in Pulp.
Merge tag 'pulp-nodes-2.5.1-0.2.beta' into 2.5-release

Tagging package [pulp-nodes] version [2.5.1-0.2.beta] in directory [nodes/].
Release 2.5.1
1166202 - documenting that EPEL requires RHEL "optional" and "extras" repos
PEP-8 the famous migration 0009 and its tests.
Merge pull request #1432 from beav/devdocs

update dev setup docs
Merge pull request #1428 from beav/f21-building

Build updates for Fedora 21.
Merge remote-tracking branch 'origin/2.6-dev'
Automatic commit of package [pulp] release [2.5.1-1].
Automatic commit of package [pulp-nodes] release [2.5.1-1].
Merge branch 'pep8-consumer_group_query'
Merge branch 'pep8-server_managers_resources'