1155604 - fixing incorrect formatting of a note
PEP-8 tests for server.managers.schedule.consumer.
PEP-8 tests for managers.repo.unit_association.
Update 2.5.x.rst

Add upgrade instructions:
 - run pulp-manage-db script
 - restart pulp services and httpd
PEP-8 server.managers.consumer.agent and tests.
PEP-8 pulp.server.db.model.dispatch.
Travis now runs flake8 on pull requests
Merge pull request #1416 from jeremycline/travis

Travis now runs flake8 on pull requests
Merge branch '2.6-dev'
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 branch '2.6-dev'
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.