I've fixed the s2s vpn db schema issue.
Thanks!
--Sheng
-Original Message-
From: Alena Prokharchyk
Sent: Sunday, August 12, 2012 1:21 PM
To: cloudstack-dev@incubator.apache.org
Cc: Anthony Xu; Sheng Yang; Brian Federle
Subject: Re: asf/vpc branch merge
The asf/vpc branch merge t
The asf/vpc branch merge to the master is completed. Some bugs were found
during the final round of regression for the VPC
1) UI - enable Static nat button doesn't work neither from Networks tab,
nor from the VPC. Brian is going to fix it.
2) create LB rule fails for VPC on th Virtual router
On 8/11/12 1:18 PM, "Wido den Hollander" wrote:
>
>
>On 08/10/2012 10:19 PM, Alena Prokharchyk wrote:
>> As I'm not a git expert, I would appreciate any help from the community
>>in
>> figuring out what is the best way to merge vpc branch into master.
>>
>>
>> Couple of ways I can think of:
>>
>>
On 08/10/2012 10:19 PM, Alena Prokharchyk wrote:
As I'm not a git expert, I would appreciate any help from the community in
figuring out what is the best way to merge vpc branch into master.
Couple of ways I can think of:
1) git checkout master; git merge -s recursive -Xignore-space-change v
> -Original Message-
> From: Alena Prokharchyk [mailto:alena.prokharc...@citrix.com]
> Sent: 10 August 2012 13:19
> To: cloudstack-dev@incubator.apache.org
> Subject: Re: asf/vpc branch merge
>
> As I'm not a git expert, I would appreciate any help from the c
On 8/10/12 1:56 PM, "David Nalley" wrote:
>You mention the main part is done, what is left for this feature for
>it to be completely done?
>
>--David
>
Bug fixes mostly. There are also some feature limitations for the current
release - VPC is supported for Xen/VmWare hypervisors only; we are
pl
As I'm not a git expert, I would appreciate any help from the community in
figuring out what is the best way to merge vpc branch into master.
Couple of ways I can think of:
1) git checkout master; git merge -s recursive -Xignore-space-change vpc
Puts all commits from the vpc that are differnt f
You mention the main part is done, what is left for this feature for
it to be completely done?
--David
Considering that there is a code freeze happening soon, and as the main
part for VPC feature development is complete + the VPC code
has been well tested by cloudStack QA engineers, it's time to discuss
merging the asf/vpc branch into asf/master. At this point its too hard to
break it to several co
