Originally 3.0-dev was branched from master, and we've merged master back
into 3.0-dev twice, once at the end of 2016 and once in early 2017. I
haven't heard about any plans to merge master -> 3.0-dev again. I want to
check in if its time to declare that we aren't going to do that merge
forward
With the release of Pulp 2.14, pulp_docker is bumping it's major version to
3.0. pulp_docker already had a 3.0-dev branch from the future Pulp3 release.
As a temporary solution we created a 3.0-dev-tmp branch for the Pulp2 docker
work.
The permanent solution is to move the current 3.0-dev
