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 see
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 d6b6c2e9d4 Thanks, Brian
_______________________________________________ Pulp-dev mailing list [email protected] https://www.redhat.com/mailman/listinfo/pulp-dev
