Automatic commit of package [pulp-rpm] release [2.4.3-0.1.beta].
Merge branch '2.4-dev' into 2.5-testing

Conflicts:
	pulp-rpm.spec
	rel-eng/packages/pulp-rpm
Merge branch '2.5-testing' into 2.5-dev
Merge branch '2.5-dev'
Fix broken unit test

This unit test worked in 2.4-* branches but not 2.5+. Newer versions of Pulp do
additional parsing of the output of parse_treeinfo and require a mock with more
verisimilitude.
Pulp Yum plugin can now find consumer.conf settings correctly
Set the version to 2.4.3-1.
Automatic commit of package [pulp-rpm] release [2.4.3-1].
Merge branch '2.4-dev' into 2.5-testing

Conflicts:
	pulp-rpm.spec
	rel-eng/packages/pulp-rpm
Merge pull request #584 from beav/fix-broken-test

Fix broken unit test
Merge branch '2.5-testing' of github.com:pulp/pulp_rpm into 2.5-testing
Merge branch '2.5-testing' into 2.5-dev
Merge branch '2.5-dev'
Merge pull request #583 from bmbouter/1152633

1152633 - Pulp Yum plugin can now find consumer.conf settings correctly
Merge branch '2.5-testing' into 2.5-dev
Merge branch '2.5-dev'
Add a new recipe.
Merge branch 'master' of github.com:pulp/pulp_rpm
pulp-dev.py installs the packages.
Merge branch 'dev_install'