970746 - Updated recipes for new proxy_* config names
969579 - The client-side yum plugins don't require the server
971154 - Add an uploads section with appropriate commands to the ISO CLI.
969579 - Further corrections to the deps for yumplugins
Change some classmethods to staticmethods.
Merge pull request #227 from pulp/jdob-969579

969579 - The client-side yum plugins don't require the server
Merge pull request #220 from pulp/jdob-970746

970746 - Updated recipes for new proxy_* config names
Combine two import statements into one line.
969529 - Remove the content-unit option in addition to the type option
Don't use self.__class__ as first argument to super().
Use the ISO model's TYPE attribute instead of using it from ids.
Automatic commit of package [pulp-rpm] release [2.2.0-0.2.beta].
Convert some methods to be static.
Merge branch 'rbarlow-971154' into pulp-2.2

Conflicts:
	pulp_rpm/src/pulp_rpm/extension/admin/iso/structure.py
Merge pull request #230 from pulp/jdob-969529

969529 - Remove the content-unit option in addition to the type option
Merge branch 'pulp-2.2' into jcline-971135
Removed the try/except blocks in favor of if/else blocks