On Thu, Aug 20, 2015 at 8:09 PM John D. Ament <johndam...@apache.org> wrote:
> This has been something that concerns me for quite a while. We have > users of Usergrid building the sources and running in prod manually without > the Usergrid PMC having created a release. Ideally we should cut the > release then encourage users to run it in prod (and yes I know its a > little redundant that the people running it in prod are on the PMC). > I think that's just a fact of life for some of us who have to support Usergrid in production via continuous integration and sometimes daily releases, but you are right: ideally we want Usergrid end-users to be running official releases and we want to be able to do frequent releases with an easy upgrade/migration path. We've got some work to do to get to that point; we still don't have a great 1.x -> 2.x migration story. > I'm fine with branch master a 1.x maintenance branch, as long as > everything has been merged from 1.x -> 2.x. We also need to clean up some > old release branches. > We have been merging 2.x -> master but, unfortunately and in the past couple of weeks, the changes in master that Todd mentioned (concurrent shard processing) have made it *very* difficult to do a master -> 2.x merge. I had to cherry pick the docs changes from 1.x to 2.x. The sooner we can move past 1.x the better. It's better for new users to be starting with 2.x so that they don't have to migrate. (Note that when I say "Usergrid users" I mean: people who have to run and maintain a Usergrid installation, not app developers who use the Usergrid REST APIs, those app developers should have very little difficulty moving from 1.x to 2.x because the REST API is the same) Dave On Thu, Aug 20, 2015 at 7:07 PM <r...@rodsimpson.com> wrote: > > > This seems like a good move. Do we need to add any verbiage to the docs > to > > indicate this change? > > > > > > > > Rod Simpson > > > > On Thu, Aug 20, 2015 at 4:28 PM, Todd Nine <todd.n...@gmail.com> wrote: > > > > > Hey all, > > > Now that we've been running 2.x in production for some time, I feel > > that > > > it's time to make this the latest stable Usergrid branch. I propose > the > > > following changes to clean up our git repository > > > 1) Rename master to 1.x (or similar) so that users still using the 1.x > > code > > > base can continue to fork and develop it. > > > 2) Rename "two-dot-o-dev" to master > > > Thoughts? >
