1017253 - Removed v1 attribute that no longer exists
Moving errata demo scripts to pulp_rpm
1020549 - tar the content of the distribution directory instead of the directory.
Add directory tree of content for unit tests.
Merge pull request #669 from pulp/jortel-1020549

1020549 - tar the content of the distribution directory instead of the directory.
Fix nodes unit tests.
1019909 - Added replica set support
Merge pull request #671 from pulp/jorte-fix-unit-tests

Fix nodes unit tests.
Merge pull request #672 from pulp/jdob-1019909

1019909 - Added replica set support
Merge branch 'pulp-2.2'
adding new  python-nectar-1.1.5 tarball and updating spec file
Automatic commit of package [python-nectar] minor release [1.1.5-1].
updating nectar dependency
Merge branch 'pulp-2.2', pre-build.
Automatic commit of package [pulp] release [2.3.0-0.24.beta].
Automatic commit of package [pulp-nodes] release [2.3.0-0.24.beta].
Merge pull request #663 from jdob/jdob-demo-scripts

Moving errata demo scripts to pulp_rpm
Merge pull request #662 from jdob/jdob-1017253

1017253 - Removed v1 attribute that no longer exists
Merge branch 'master' into pulp-2.4

Conflicts:
	server/etc/pulp/server.conf
	server/pulp/server/db/connection.py