stateless.org

The great Stateless merge of 2011

Stateless needs to become the new master somehow/eventually

Have to keep old branches around for hotfixes

We need to keep topic branches around not only for merging into stateless-master, but maybe merging into things like rackspace and webroot until those companies are on the stateless deployment.

Need to merge UA into new master and back into stateless

Have to finish work for elasticsearch on stateless

This is the biggest piece of work

Proposed plan

Let QA finish their testing on UA branch

Reset master to be UA

Merge master into stateless (will take quite a while)

Merge stateless into dev (or reset dev to stateless), deploy and test in dev stack

All new stories that are not for an upcoming deployment should be branched from the stateless branch

All hotfixes and upcoming deploys should be branched from the old master

When merging a story that was not branched from stateless back into QA, merge into stateless also

QA will continue with the normal QA process

Once all the branches that were branched off of the old master have been through QA on non-stateless, we will have QA test the stateless branch

Over time, more and more branches should be branched from stateless until we are ready for a stateless production deploy

We should push for as many branches as possible to be branched from stateless so that our lives will be easier