[Pulp-dev] master merged to 3.0-dev

Brian Bouterse bbouters at redhat.com
Fri Nov 18 14:21:14 UTC 2016

For platform only, I just merged the master branch into 3.0-dev. If you are
curious what was brought forward you can see the merge commit [0]. You'll

There were two types of conflicts, modify/delete conflicts from things
removed on 3.0-dev and changed on master or version numbers changing due to
master becoming 2.12. Both of these were easy to resolve.

Related to this, if you are moving code from one path to another on the
3.0-dev branch please remove the code from it's original location.

[0]: https://github.com/pulp/pulp/commit/1b11405b921965620043ba47d98d0e

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listman.redhat.com/archives/pulp-dev/attachments/20161118/fa652749/attachment.htm>

More information about the Pulp-dev mailing list