> -----Original Message----- > From: Chip Childers [mailto:[email protected]] > Sent: Wednesday, August 01, 2012 2:39 PM > To: <[email protected]> > Cc: David Nalley; Kelven Yang; Alena Prokharchyk > Subject: Re: Review Request: Merge Kelven's VPC code for Vmware into > asf vpc branch > > On Aug 1, 2012, at 5:21 PM, Vijayendra Bhamidipati > <[email protected]> wrote: > > > Hi David, > > > > This is Kelven's code that he checked in to the 3.0.x branch - I'm > only merging it to the asf branch. After the recent code re-org, > cherry-picking the patches wouldn't work, so I had to merge the code > for each file. > > When you say ASF branch, are we talking about code being developed > privately inside of Citrix, and then sent to review board for > inclusion into the master branch within the ASF repo?
Yes, Citrix has a number of feature branches that we've been holding because we didn't know what we were doing with them while the 4.0 legal and policy issues were sorted out. Now that we've got a release plan for 4.0, we're getting all that code merged and published. Cheers, Ewan.
