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
Travis now runs flake8 on pull requests
Merge pull request #1416 from jeremycline/travis

Travis now runs flake8 on pull requests
1167908 - Migration for TaskStatus and Reserved Resources
Merge pull request #1405 from dkliban/2.6-dev

1167908 - Migration for TaskStatus and Reserved Resources
Automatic commit of package [pulp] release [2.4.4-0.2.beta].
Automatic commit of package [pulp-nodes] release [2.4.4-0.2.beta].
Merge branch '2.4-testing' into 2.4-dev
Merge branch '2.4-dev' into 2.5-testing

Conflicts:
	nodes/pulp-nodes.spec
	pulp.spec
	rel-eng/packages/pulp
	rel-eng/packages/pulp-nodes
Merge branch '2.5-testing' into 2.6-dev
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