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
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.
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
Merge pull request #1428 from beav/f21-building

Build updates for Fedora 21.
Automatic commit of package [pulp] release [2.5.1-1].
Automatic commit of package [pulp-nodes] release [2.5.1-1].
Merge remote-tracking branch 'origin/1166202' into 2.5-release
Merge remote-tracking branch 'origin/1166202' into 2.5-testing
Merge remote-tracking branch 'origin/1166202' into 2.6-dev
Merge branch '2.5-release' into 2.5-dev
Update the version in the spec files
Merge forward from 2.5-dev
Merge pull request #1331 from skarmark/1155604

1155604 -  fixing incorrect formatting of a note
Merge branch '2.4-release' into 2.4-testing
Merge branch '2.4-testing' into 2.4-dev
Merge branch '2.4-release' into 2.5-release