You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@cloudstack.apache.org by Kelven Yang <ke...@citrix.com> on 2013/02/01 01:07:57 UTC
[MERGE] javelin to master
This is a call to confirm if it is a good time to actually perform the
merge anytime soon. I've sync-ed javelin with master up to this morning
and I'll do a sync again at the end of day today.
Is it a good time to pull the trigger midnight today (PST time)?
Kelven
Re: [MERGE] javelin is now merged into master - doc build conflicts
Posted by Chip Childers <ch...@sungard.com>.
On Feb 1, 2013, at 8:28 PM, Kelven Yang <ke...@citrix.com> wrote:
> For some reason, document conflicts did not appear in my git "merge
> conflicts", I resolved doc conflicts after the merge now.
>
> Jessica T, please double check if my resolution for these conflicts, I
> have little idea to verify the correctness of these document.
>
> Kelven
>
>
All set for the release branch now then? (We can fix issues obviously as we go)
[MERGE] javelin is now merged into master - doc build conflicts
Posted by Kelven Yang <ke...@citrix.com>.
For some reason, document conflicts did not appear in my git "merge
conflicts", I resolved doc conflicts after the merge now.
Jessica T, please double check if my resolution for these conflicts, I
have little idea to verify the correctness of these document.
Kelven
[MERGE] javelin is now merged into master
Posted by Kelven Yang <ke...@citrix.com>.
A side note, when you are running management server with mvn, try to
increase the JVM memory settings
For linux/Mac users
MAVEN_OPTS="-XX:MaxPermSize=512m -Xmx2g"
export MAVEN_OPTS
For Windows users
Add similar settings to windows environment settings (via Windows control
panel)
Kelven
[MERGE] javelin to master
Posted by Kelven Yang <ke...@citrix.com>.
Please hold on check-ins to master, I'm now testing the final merge from
Javelin and will push the merge soon, I'll notify when it's done.
Kelven
Re: [MERGE] javelin to master
Posted by Min Chen <mi...@citrix.com>.
+1
On 1/31/13 6:01 PM, "Ahmad Emneina" <ae...@gmail.com> wrote:
>+1
>
>
>On Thu, Jan 31, 2013 at 5:58 PM, Frank Zhang <Fr...@citrix.com>
>wrote:
>
>> +1
>>
>> > -----Original Message-----
>> > From: rohityadav89@gmail.com [mailto:rohityadav89@gmail.com] On Behalf
>> > Of Rohit Yadav
>> > Sent: Thursday, January 31, 2013 5:35 PM
>> > To: cloudstack-dev@incubator.apache.org
>> > Subject: Re: [MERGE] javelin to master
>> >
>> > +1!
>> >
>> > On Thu, Jan 31, 2013 at 4:28 PM, Chiradeep Vittal
>> > <Ch...@citrix.com> wrote:
>> > > +1
>> > >
>> > > On 1/31/13 4:18 PM, "Chip Childers" <ch...@sungard.com>
>>wrote:
>> > >
>> > >>On Jan 31, 2013, at 7:08 PM, Kelven Yang <ke...@citrix.com>
>> wrote:
>> > >>
>> > >>> This is a call to confirm if it is a good time to actually perform
>> > >>> the merge anytime soon. I've sync-ed javelin with master up to
>>this
>> > >>> morning and I'll do a sync again at the end of day today.
>> > >>>
>> > >>> Is it a good time to pull the trigger midnight today (PST time)?
>> > >>>
>> > >>> Kelven
>> > >>>
>> > >>>
>> > >>
>> > >>I have no objection. Others?
>> > >
>>
Re: [MERGE] javelin to master
Posted by Ahmad Emneina <ae...@gmail.com>.
+1
On Thu, Jan 31, 2013 at 5:58 PM, Frank Zhang <Fr...@citrix.com> wrote:
> +1
>
> > -----Original Message-----
> > From: rohityadav89@gmail.com [mailto:rohityadav89@gmail.com] On Behalf
> > Of Rohit Yadav
> > Sent: Thursday, January 31, 2013 5:35 PM
> > To: cloudstack-dev@incubator.apache.org
> > Subject: Re: [MERGE] javelin to master
> >
> > +1!
> >
> > On Thu, Jan 31, 2013 at 4:28 PM, Chiradeep Vittal
> > <Ch...@citrix.com> wrote:
> > > +1
> > >
> > > On 1/31/13 4:18 PM, "Chip Childers" <ch...@sungard.com> wrote:
> > >
> > >>On Jan 31, 2013, at 7:08 PM, Kelven Yang <ke...@citrix.com>
> wrote:
> > >>
> > >>> This is a call to confirm if it is a good time to actually perform
> > >>> the merge anytime soon. I've sync-ed javelin with master up to this
> > >>> morning and I'll do a sync again at the end of day today.
> > >>>
> > >>> Is it a good time to pull the trigger midnight today (PST time)?
> > >>>
> > >>> Kelven
> > >>>
> > >>>
> > >>
> > >>I have no objection. Others?
> > >
>
RE: [MERGE] javelin to master
Posted by Frank Zhang <Fr...@citrix.com>.
+1
> -----Original Message-----
> From: rohityadav89@gmail.com [mailto:rohityadav89@gmail.com] On Behalf
> Of Rohit Yadav
> Sent: Thursday, January 31, 2013 5:35 PM
> To: cloudstack-dev@incubator.apache.org
> Subject: Re: [MERGE] javelin to master
>
> +1!
>
> On Thu, Jan 31, 2013 at 4:28 PM, Chiradeep Vittal
> <Ch...@citrix.com> wrote:
> > +1
> >
> > On 1/31/13 4:18 PM, "Chip Childers" <ch...@sungard.com> wrote:
> >
> >>On Jan 31, 2013, at 7:08 PM, Kelven Yang <ke...@citrix.com> wrote:
> >>
> >>> This is a call to confirm if it is a good time to actually perform
> >>> the merge anytime soon. I've sync-ed javelin with master up to this
> >>> morning and I'll do a sync again at the end of day today.
> >>>
> >>> Is it a good time to pull the trigger midnight today (PST time)?
> >>>
> >>> Kelven
> >>>
> >>>
> >>
> >>I have no objection. Others?
> >
Re: [MERGE] javelin to master
Posted by Rohit Yadav <bh...@apache.org>.
+1!
On Thu, Jan 31, 2013 at 4:28 PM, Chiradeep Vittal
<Ch...@citrix.com> wrote:
> +1
>
> On 1/31/13 4:18 PM, "Chip Childers" <ch...@sungard.com> wrote:
>
>>On Jan 31, 2013, at 7:08 PM, Kelven Yang <ke...@citrix.com> wrote:
>>
>>> This is a call to confirm if it is a good time to actually perform the
>>> merge anytime soon. I've sync-ed javelin with master up to this morning
>>> and I'll do a sync again at the end of day today.
>>>
>>> Is it a good time to pull the trigger midnight today (PST time)?
>>>
>>> Kelven
>>>
>>>
>>
>>I have no objection. Others?
>
Re: [MERGE] javelin to master
Posted by Chiradeep Vittal <Ch...@citrix.com>.
+1
On 1/31/13 4:18 PM, "Chip Childers" <ch...@sungard.com> wrote:
>On Jan 31, 2013, at 7:08 PM, Kelven Yang <ke...@citrix.com> wrote:
>
>> This is a call to confirm if it is a good time to actually perform the
>> merge anytime soon. I've sync-ed javelin with master up to this morning
>> and I'll do a sync again at the end of day today.
>>
>> Is it a good time to pull the trigger midnight today (PST time)?
>>
>> Kelven
>>
>>
>
>I have no objection. Others?
Re: [MERGE] javelin to master
Posted by Chip Childers <ch...@sungard.com>.
On Jan 31, 2013, at 7:08 PM, Kelven Yang <ke...@citrix.com> wrote:
> This is a call to confirm if it is a good time to actually perform the
> merge anytime soon. I've sync-ed javelin with master up to this morning
> and I'll do a sync again at the end of day today.
>
> Is it a good time to pull the trigger midnight today (PST time)?
>
> Kelven
>
>
I have no objection. Others?