Hi Chip,
FYI. I also cannot use "git am" to apply this patch, it can only be
applied through "git apply", not sure why. Also, the patch downloaded from
review board cannot be applied even through "git apply". Vijay gave me his
patch last Friday, and I can apply that one using "git apply" and mvn
build is successful. I have committed that patch to 4.1.
Thanks
-min
On 3/25/13 9:36 AM, "Chip Childers" <chip.child...@sungard.com> wrote:
>On Mon, Mar 25, 2013 at 09:33:38AM -0700, Animesh Chaturvedi wrote:
>>
>>
>> > -----Original Message-----
>> > From: Chip Childers [mailto:chip.child...@sungard.com]
>> > Sent: Monday, March 25, 2013 8:15 AM
>> > To: Animesh Chaturvedi
>> > Cc: dev@cloudstack.apache.org; Frank Zhang; Kelven Yang; cloudstack;
>> > Vijayendra Bhamidipati
>> > Subject: Re: Review Request: Temporarily disabling baremetal
>>functionality in
>> > CS 4.1
>> >
>> > On Mon, Mar 25, 2013 at 08:12:52AM -0700, Animesh Chaturvedi wrote:
>> > > Vijay
>> > >
>> > > Can you check this again with a new workspace? Chip both Min and I
>>had
>> > verified on Friday that patch was applying before Vijay posted it. I
>>will also try
>> > again with fresh 4.1. Sorry for the inconvenience.
>> >
>> > I did a "git fetch origin; git checkout 4.1; git reset --hard
>>origin/4.1" before "git
>> > am ...". I don't quite get what the conflict is.
>> >
>> > Try the process above, including the git am using the patch available
>>within
>> > the review. Perhaps the posting process is mangling things?
>> >
>> [Animesh>] Sure Chip, we will try again and try to close it soon
>
>Animesh,
>
>If you can get a clean "git am", and the system builds, you can go ahead
>and push the commit to origin/4.1. I'm not trying to get in the way of
>getting the commits into the branch... just to confirm that things are
>going in cleanly and that the build continues to work (and that only
>appropriate changes are made).
>
>> >
>> > >
>> > > Thanks
>> > > Animesh
>> > >
>> > > On Mar 24, 2013, at 11:08 AM, "Chip Childers"
>> > <chip.child...@sungard.com> wrote:
>> > >
>> > > >
>> > > > -----------------------------------------------------------
>> > > > This is an automatically generated e-mail. To reply, visit:
>> > > > https://reviews.apache.org/r/10071/#review18329
>> > > > -----------------------------------------------------------
>> > > >
>> > > >
>> > > > This patch still doesn't apply cleanly. Now sure what's going
>>on. Please
>> > test with a fresh copy of the 4.1 branch to ensure that it's a clean
>>patch.
>> > > >
>> > > > git am ~/patches/10071.patch
>> > > > Applying: CS-1773: Disable baremetal functionality
>> > > > error: patch failed:
>> > > > server/src/com/cloud/configuration/Config.java:359
>> > > > error: server/src/com/cloud/configuration/Config.java: patch does
>> > > > not apply Patch failed at 0001 CS-1773: Disable baremetal
>> > > > functionality
>> > > >
>> > > > - Chip Childers
>> > > >
>> > > >
>> > > > On March 22, 2013, 11:55 p.m., Venkata Siva Vijayendra Bhamidipati
>> > wrote:
>> > > >>
>> > > >> -----------------------------------------------------------
>> > > >> This is an automatically generated e-mail. To reply, visit:
>> > > >> https://reviews.apache.org/r/10071/
>> > > >> -----------------------------------------------------------
>> > > >>
>> > > >> (Updated March 22, 2013, 11:55 p.m.)
>> > > >>
>> > > >>
>> > > >> Review request for cloudstack, Kelven Yang and Frank Zhang.
>> > > >>
>> > > >>
>> > > >> Description
>> > > >> -------
>> > > >>
>> > > >> Temporarily disabling baremetal functionality in CS 4.1
>> > > >>
>> > > >>
>> > > >> This addresses bug CS-1773.
>> > > >>
>> > > >>
>> > > >> Diffs
>> > > >> -----
>> > > >>
>> > > >> client/pom.xml 38ba405
>> > > >> client/tomcatconf/componentContext.xml.in ff7376e
>> > > >> client/tomcatconf/nonossComponentContext.xml.in 35e1b28
>> > > >> plugins/pom.xml 02459b4
>> > > >> server/src/com/cloud/configuration/Config.java 17fe62b
>> > > >> setup/db/db/schema-40to410.sql 754bfb6
>> > > >>
>> > > >> Diff: https://reviews.apache.org/r/10071/diff/
>> > > >>
>> > > >>
>> > > >> Testing
>> > > >> -------
>> > > >>
>> > > >> Baremetal and Cisco UCS related APIs confirmed to not be exposed
>>to
>> > clients.
>> > > >>
>> > > >>
>> > > >> Thanks,
>> > > >>
>> > > >> Venkata Siva Vijayendra Bhamidipati
>> > > >
>> > >
>>
