Dan has submitted a PR to merge the postgres branch into master - https://github.com/apache/incubator-trafficcontrol/pull/168
In doing so, he had to work through a number of conflicts. I am going to give his PR a once over and then hopefully merge it today. Jeremy On Fri, Jan 6, 2017 at 12:04 PM, Eric Friedrich (efriedri) < [email protected]> wrote: > Following some more discussion on Slack, we are still planning to merge > the postgres branch into master today. > > However, we will defer cutting the 2.0 release branch until after the 1.8 > release passes apache incubator voting. > > This will cut down on the amount of back porting needed, by keeping the > number of active branches down. > > Any objections? > —Eric > > > On Jan 6, 2017, at 8:27 AM, Jan van Doorn <[email protected]> wrote: > > > > We are moving away from MySQL, so from 2.0 on, we only support Postgres. > > > > And, to emphasize, master will be moving to Postgres as well, all > releases after 2.0 will be Postgres. > > > > There will be a migration included that migrates your existing database. > > > > Rgds, > > JvD > > > >> On Jan 6, 2017, at 4:44 AM, Eric Friedrich (efriedri) < > [email protected]> wrote: > >> > >> Will 2.0 still support MySQL or just Postgres? > >> > >> Will the 2.0 release include auto-migration from MySQL to Postgres? > >> > >> Any other changes coming in that branch other than the move to a > different DB? > >> > >> —Eric > >> > >>> On Jan 5, 2017, at 6:33 PM, Jeremy Mitchell <[email protected]> > wrote: > >>> > >>> As discussed in the traffic-control-cdn#dev slack channel, the plan is > to > >>> merge the contents of the postgres branch ( > >>> https://github.com/apache/incubator-trafficcontrol/tree/postgres) to > the > >>> master branch by Friday, 1/6/16 end of day and subsequently cut a 2.0.x > >>> branch. > >>> > >>> Included in 2.0.x will be any commits applied to master after 1.8.x > was cut > >>> - https://github.com/apache/incubator-trafficcontrol/ > compare/1.8.x...master > >>> > >>> plus, of course, changes made to support Traffic Ops on Postgres. > >>> > >>> This also means if you have any outstanding PR's ( > >>> https://github.com/apache/incubator-trafficcontrol/pulls) that you > want in > >>> 2.0.x, reach out to a committer to get them merged. Otherwise, they > will > >>> have to target the 2.1 release. > >>> > >>> Questions? Concerns? > >>> > >>> thanks. > >> > > > >
