> -----Original Message----- > From: John Kinsella [mailto:j...@stratosec.co] > Sent: Wednesday, August 15, 2012 1:21 PM > To: <cloudstack-dev@incubator.apache.org> > Subject: Re: [ASFCS40]merges to 4.0 > > I see 2 branches now - a 4.0, and asf-4.0...we might want to standardize > on one of them...
Oops, afs-4.0 is accidently created by myself, I think. I'll remove it. > > On Aug 15, 2012, at 1:08 PM, Alex Huang <alex.hu...@citrix.com> > wrote: > > > I've completed merges to 4.0 from master up to commit > 95a60dc8bc7dbda2c83d48cb47ed77a765b984f8. > > > > I did not include the following commits: > > > > dc07b2e3e616d6f945b8e85756c9f3a4f72b2fec - Brian Federle : There's a > merge conflict and I don't understand java script enough to resolve it. > Brian, please resolve it. > > > > 7e093a949d2445d320b1fba330ad802dc14db1b8 - Mice Xia: This change > would change behavior of CloudStack. Please submit comments about what > testing were done or if it doesn't change behavior, please comment on > why. > > > > --Alex > > > >
