i.da...@citrix.com>> wrote:
>> Just a thought about the squashed merge, if there are multiple developers
>> working on a feature branch as in this case, won't it be better to preserve
>> the change history?
>>
>> -Original Message-
>> From: Min Chen [mailto:
@cloudstack.apache.org>" dev@cloudstack.apache.org><mailto:dev@cloudstack.apache.org>>
> Date: Friday, March 14, 2014 at 10:05 AM
> To: "dev@cloudstack.apache.org<mailto:dev@cloudstack.apache.org> dev@cloudstack.apache.org>" dev@cloudstack.apache.or
.apache.org><mailto:dev@cloudstack.apache.org>"
mailto:dev@cloudstack.apache.org><mailto:dev@cloudstack.apache.org>>
Subject: Re: [Merge] CloudStack IAM branch to master
Maybe, although to some extent the action of merging I think should be
seen as saying "this is co
It is already in 4.4 as well.
Kelven
On 3/14/14, 3:58 PM, "Marcus" wrote:
>That is, I'll pull the current 4.4 into my branch and test before I merge
>it in
>
>
>On Fri, Mar 14, 2014 at 4:57 PM, Marcus wrote:
>> Can we get the fix in 4.4? I'd rather sync that then master, since it
>> has been c
That is, I'll pull the current 4.4 into my branch and test before I merge it in
On Fri, Mar 14, 2014 at 4:57 PM, Marcus wrote:
> Can we get the fix in 4.4? I'd rather sync that then master, since it
> has been cut already.
>
>
> On Fri, Mar 14, 2014 at 4:00 PM, Kelven Yang wrote:
>> Marcus,
>>
Can we get the fix in 4.4? I'd rather sync that then master, since it
has been cut already.
On Fri, Mar 14, 2014 at 4:00 PM, Kelven Yang wrote:
> Marcus,
>
> I¹ve pushed the fix to master already. You probably need to sync your
> local branch with master
>
> Kelven
>
> On 3/14/14, 11:08 AM, "Mar
Marcus,
I¹ve pushed the fix to master already. You probably need to sync your
local branch with master
Kelven
On 3/14/14, 11:08 AM, "Marcus" wrote:
>It's in branch resize-root
>
>On Fri, Mar 14, 2014 at 10:47 AM, Min Chen wrote:
>> Marcus,
>>
>> What is the latest commit you have pick
@cloudstack.apache.org<mailto:dev@cloudstack.apache.org>"
mailto:dev@cloudstack.apache.org>>
Subject: Re: [Merge] CloudStack IAM branch to master
Maybe, although to some extent the action of merging I think should be
seen as saying "this is complete". If the history is impo
It's in branch resize-root
On Fri, Mar 14, 2014 at 10:47 AM, Min Chen wrote:
> Marcus,
>
> What is the latest commit you have picked up on your local setup from
> master? Our QA reports similar issues caused by recent VMSync bug fix,
> just want to make sure that your local code has that
Ok, thanks.
On Fri, Mar 14, 2014 at 10:56 AM, Kelven Yang wrote:
> That¹s my bad. I cherry-picked a fix after IAM¹s merge and this has broken
> it. The problem didn¹t show up in my local run.
>
> I¹m working on a fix of it.
>
> Kelven
>
> On 3/14/14, 9:47 AM, "Min Chen" wrote:
>
>>Marcus,
>>
>>
better to preserve
> the change history?
>
> -Original Message-
> From: Min Chen [mailto:min.c...@citrix.com]
> Sent: Friday, March 14, 2014 9:35 AM
> To: dev@cloudstack.apache.org
> Subject: Re: [Merge] CloudStack IAM branch to master
>
> Thanks Marcus. I am
: dev@cloudstack.apache.org
Subject: Re: [Merge] CloudStack IAM branch to master
Thanks Marcus. I am not aware of this convention, will remember that next time
when I do the merge.
-min
On 3/13/14 10:30 PM, "Marcus" wrote:
>Min, in looking at this branch merge, I need to be reminde
That¹s my bad. I cherry-picked a fix after IAM¹s merge and this has broken
it. The problem didn¹t show up in my local run.
I¹m working on a fix of it.
Kelven
On 3/14/14, 9:47 AM, "Min Chen" wrote:
>Marcus,
>
> What is the latest commit you have picked up on your local setup from
>master?
Marcus,
What is the latest commit you have picked up on your local setup from
master? Our QA reports similar issues caused by recent VMSync bug fix,
just want to make sure that your local code has that fix.
Thanks
-min
On 3/14/14 9:37 AM, "Min Chen" wrote:
>Before merge
Before merge, I did a sanity zone and VM deployment test, and worked fine
on my setup after fixing the issues introduced by Antonio's commit. I can
verify this again today. From the symptom, it seems not related to IAM
change.
Thanks
-min
On 3/14/14 1:07 AM, "Marcus" wrote:
>creating a new ro
Thanks Marcus. I am not aware of this convention, will remember that next
time when I do the merge.
-min
On 3/13/14 10:30 PM, "Marcus" wrote:
>Min, in looking at this branch merge, I need to be reminded whether we
>are supposed to squash feature branches when they come in, or preserve
>history.
creating a new router does the same...
2014-03-14 02:06:41,446 DEBUG [vm.dao.VMInstanceDaoImpl]
(Work-Job-Executor-5:Job-41/Job-42 ctx-91928df8) Unable to update
VM[DomainRouter|r-5-VM]: DB Data={Host=1; State=Running; updated=3;
time=Fri Mar 14 02:06:11 MDT 2014} New Data: {Host=1; State=Running;
I have no idea if its related to this branch merge or not, but I'm
unable to start the ssvm on master since I pulled about an hour ago. I
can deploy a fresh zone, and the ssvm will actually start, but it
can't transition state in the DB, so it kills the vm.
2014-03-14 01:57:46,356 DEBUG [vm.dao.VM
Min, in looking at this branch merge, I need to be reminded whether we
are supposed to squash feature branches when they come in, or preserve
history. It's nice to preserve history, but it's a lot easier to undo
a squashed merge.
On Thu, Mar 13, 2014 at 5:56 PM, Min Chen wrote:
> IAM branch is no
IAM branch is now merged to master.
Thanks
-min
On 3/13/14 10:13 AM, "Min Chen" wrote:
>Since we haven't heard of any objections to this merge for 3 days, I am
>going to merge it to master today.
>
>Thanks
>-min
>
>On 3/11/14 12:23 PM, "Hugo Trippaers" wrote:
>
>>
>>On 11 mrt. 2014, at 19:52,
Since we haven't heard of any objections to this merge for 3 days, I am
going to merge it to master today.
Thanks
-min
On 3/11/14 12:23 PM, "Hugo Trippaers" wrote:
>
>On 11 mrt. 2014, at 19:52, Min Chen wrote:
>
>> Also, have already run FingBugs on our branch and addressed all new
>> findings
On 11 mrt. 2014, at 19:52, Min Chen wrote:
> Also, have already run FingBugs on our branch and addressed all new
> findings introduced by our branch.
Awesome! :-)
>
> Thanks.
> -min
>
> On 3/10/14 7:33 PM, "Min Chen" wrote:
>
>> No new jar dependencies.
>>
>> -min
>>
>> Sent from my iPho
Also, have already run FingBugs on our branch and addressed all new
findings introduced by our branch.
Thanks.
-min
On 3/10/14 7:33 PM, "Min Chen" wrote:
>No new jar dependencies.
>
>-min
>
>Sent from my iPhone
>
>> On Mar 10, 2014, at 7:22 PM, "Chiradeep Vittal"
>> wrote:
>>
>> Any new jar de
No new jar dependencies.
-min
Sent from my iPhone
> On Mar 10, 2014, at 7:22 PM, "Chiradeep Vittal"
> wrote:
>
> Any new jar dependencies?
>
>> On 3/10/14, 11:34 AM, "Min Chen" wrote:
>>
>> Hi,
>>
>> Prachi and I would like to merge CloudStack Identity and Access
>> Management(IAM) plugin
Any new jar dependencies?
On 3/10/14, 11:34 AM, "Min Chen" wrote:
>Hi,
>
>Prachi and I would like to merge CloudStack Identity and Access
>Management(IAM) plugin services to the master branch. Development for
>this effort has been done by Prachi and me on ACS rbac branch
>(https://git-wip-us.apa
25 matches
Mail list logo
