Chip, all my fixes that I've put to this branch, were originally committed
to master. I cherry-picked them to the master-6-17-stable.


commit 5d0a1cee13fb3006f3e35cd221e553587ea20ce2
Author: Alena Prokharchyk <alena.prokharc...@citrix.com>
Date:   Mon Jun 17 16:10:12 2013 -0700

    CLOUDSTACK-2883: create default network offering with internal lb
support (if doesn't exist already)

commit 952fa2464da9f10b63fbba869922ee735c231c42
Author: Alena Prokharchyk <alena.prokharc...@citrix.com>
Date:   Mon Jun 17 10:50:22 2013 -0700

    LOUDSTACK-2914: handle situation when serviceProvider map is empty

commit fc16e29f992d81156a4e08a77da215f8276f4efe
Author: Alena Prokharchyk <alena.prokharc...@citrix.com>
Date:   Mon Jun 17 10:09:52 2013 -0700

    CLOUDSTACK-2914: default lb scheme to Public when the service LB is
enabled, and scheme is not specified explicitly



-Alena.


On 6/18/13 11:59 AM, "Chip Childers" <chip.child...@sungard.com> wrote:

>Min, Jessica, Alena,
>
>What's going on in this branch?
>
>The commits are curious.  Are these fixes going into master?
>
>On Mon, Jun 17, 2013 at 07:37:52PM +0000, Chiradeep Vittal wrote:
>> David, this is a temporary scratch branch to perform some integration
>> testing since atm the master looks stable.
>> 
>> On 6/17/13 11:57 AM, "David Nalley" <da...@gnsa.us> wrote:
>> 
>> >What is this branch for?
>> >On Jun 17, 2013 1:27 PM, <chirad...@apache.org> wrote:
>> >
>> >> Updated Branches:
>> >>   refs/heads/master-6-17-stable [created] fc16e29f9
>> >>
>> 
>> 
>


Reply via email to