On Wed, Mar 06, 2013 at 11:19:50AM +0530, Nitin Mehta wrote: > Chip - This is relatively small feature and more or less isolated with > other functionalities. > IMHO I don¹t think it needs a different feature branch. I will definitely > add unit tests for this though.
I disagree. As Alex noted, you changed 18 files and the build obviously broke because of it. I'd assess this change as being one that "doing the right thing" would be to have had a branch from which to propose a merge. It's a gray area, but leaning towards more a conservative approach to master branch stability will serve us well as a community. > > Thanks, > -Nitin > > On 05/03/13 12:02 AM, "Chip Childers" <chip.child...@sungard.com> wrote: > > >On Mon, Mar 04, 2013 at 10:00:24AM -0800, Alex Huang wrote: > >> -1 on this checkin > >> > >> And this is not a small change. 18 files. Some large completely new > >>methods checked in. Changes to the virtual machine state machine. No > >>unit testing. > >> > >> I would reject this fix on these problems alone. > > > >Nitin, > > > >Shouldn't a change this big be in a feature branch, with a MERGE request > >to bring it into master? > > > >> > >> --Alex > >> > >> > -----Original Message----- > >> > From: Alex Huang [mailto:alex.hu...@citrix.com] > >> > Sent: Monday, March 4, 2013 9:56 AM > >> > To: cloudstack-dev@incubator.apache.org > >> > Cc: Nitin Mehta; Abhinandan Prateek > >> > Subject: RE: Master branch build is broken again > >> > > >> > Min, > >> > > >> > You should just revert the commit. > >> > > >> > --Alex > >> > > >> > > -----Original Message----- > >> > > From: Min Chen [mailto:min.c...@citrix.com] > >> > > Sent: Monday, March 4, 2013 9:51 AM > >> > > To: cloudstack-dev@incubator.apache.org > >> > > Cc: Nitin Mehta > >> > > Subject: Master branch build is broken again > >> > > Importance: High > >> > > > >> > > Hi there, > >> > > > >> > > I could not compile master after pulling latest code today, build > >> > > failed with the following error: > >> > > > >> > > [ERROR] Failed to execute goal > >> > > org.apache.maven.plugins:maven-compiler- > >> > > plugin:2.5.1:compile (default-compile) on project cloud-engine- > >> > orchestration: > >> > > Compilation failure [ERROR] /Users/minc/dev/cloud- > >> > > > >>asf/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity > >> > > /a > >> > > pi/db/VMEntityVO.java:[52,7] > >> > > org.apache.cloudstack.engine.cloud.entity.api.db.VMEntityVO is not > >> > > abstract and does not override abstract method getNewSvcOfferingId() > >> > > in com.cloud.vm.VirtualMachine [ERROR] -> [Help 1] > >> > > > >> > > I checked the commit history, it seems related to commit > >> > > e0019eccd997d9b2b3ff9395bcd99f821f5121db, so CC Nitin here. Can > >> > > somebody quickly fix this? This is blocking me from verifying > >> > > CLOUDSTACK- > >> > > 1491 and merge my feature branch vim51_win8. > >> > > > >> > > Thanks > >> > > -min > >> > > > >> > >> > >
