Yeah, I agree. :) I think I merged instead of rebased.
On Mon, Aug 26, 2013 at 5:00 PM, Brian Federle <brian.fede...@citrix.com>wrote: > Probably something just got messed up during the rebase, I see this > commit below yours:**** > > ** ** > > commit ae68c841f668768118bbff07f07060416fb16d48**** > > Author: Jessica Wang <jessicaw...@apache.org>**** > > Date: Mon Aug 26 14:24:22 2013 -0700**** > > ** ** > > CLOUDSTACK-4089: UI > zone wizard > hypervisor VMware > configure > physical network > edit traffic type label > split**** > > ** ** > > Which modifies system.js -- probably committed at the same time as you.*** > * > > ** ** > > I only think this because I’ve definitely screwed stuff up in git myself > in the past when I forget to rebase :D**** > > ** ** > > -Brian**** > > ** ** > > *From:* Animesh Chaturvedi > *Sent:* Monday, August 26, 2013 3:56 PM > *To:* Mike Tutkowski > *Cc:* dev@cloudstack.apache.org; Brian Federle; Jessica Wang > *Subject:* RE: [VOTE] Apache Cloudstack 4.2.0**** > > ** ** > > Mike the commit message shows it is a merge “Merge remote-tracking branch > 'upstream/4.2-forward' into 4.2-forward”**** > > ** ** > > Adding Brian and Jessica to the thread. **** > > ** ** > > *From:* Mike Tutkowski > [mailto:mike.tutkow...@solidfire.com<mike.tutkow...@solidfire.com>] > > *Sent:* Monday, August 26, 2013 3:45 PM > *To:* Animesh Chaturvedi > *Cc:* dev@cloudstack.apache.org; Brian Federle > *Subject:* Re: [VOTE] Apache Cloudstack 4.2.0**** > > ** ** > > I don't understand how those got in there.**** > > ** ** > > I think they were merged into my code from Jessica's earlier checkin.**** > > ** ** > > They are not related to my fix.**** > > ** ** > > On Mon, Aug 26, 2013 at 4:41 PM, Animesh Chaturvedi < > animesh.chaturv...@citrix.com> wrote:**** > > Mike with your commit 6a2f15f94ae74b563a2d4df6da38e7f6ff44c8ac > > I see a few changes to > > Ui\scripts\ui-custom\zoneWizard.js > Ui\scripts\zoneWizard.js > > Are they needed for your CHAP changes? These seems unrelated to me. > > > Animesh**** > > > > -----Original Message----- > > From: Mike Tutkowski [mailto:mike.tutkow...@solidfire.com]**** > > > Sent: Monday, August 26, 2013 2:44 PM > > To: dev@cloudstack.apache.org > > Subject: Re: [VOTE] Apache Cloudstack 4.2.0 > > > > OK, Animesh. > > > > My changes are in 4.2-forward now. > > > > Thanks! > > > > > > On Mon, Aug 26, 2013 at 3:18 PM, Mike Tutkowski < > > mike.tutkow...@solidfire.com> wrote: > > > > > No problem - I'll let you know when it's there. > > > > > > > > > On Mon, Aug 26, 2013 at 2:54 PM, Animesh Chaturvedi < > > > animesh.chaturv...@citrix.com> wrote: > > > > > >> > > >> > > >> > -----Original Message----- > > >> > From: Mike Tutkowski [mailto:mike.tutkow...@solidfire.com] > > >> > Sent: Monday, August 26, 2013 1:48 PM > > >> > To: dev@cloudstack.apache.org > > >> > Subject: Re: [VOTE] Apache Cloudstack 4.2.0 > > >> > > > >> > Hi Animesh, > > >> > > > >> > It is related to adding an iSCSI target to ESX(i). > > >> > > > >> > The 4.2 code assumes you will want to use Mutual CHAP. This fix > > >> > allows the user to not have to use Mutual CHAP. > > >> > > > >> > It's only a small number of changes, pretty low risk, and should > > >> > only impact the SolidFire plug-in as no other plug-in code has been > > >> > written to date that uses the logic in the VMware code that I would > > >> > need to modify. > > >> > > > >> > I've written and tested the code, as well. > > >> > > > >> > Talk to you later, > > >> > > > >> [Animesh>] Can you put your fix in 4.2-forward ASAP > > >> > > > > > > > > > > > > --**** > > > > *Mike Tutkowski* > > > *Senior CloudStack Developer, SolidFire Inc.***** > > > > e: mike.tutkow...@solidfire.com > > > o: 303.746.7302 > > > Advancing the way the world uses the**** > > > > cloud<http://solidfire.com/solution/overview/?video=play> > > > *(tm)***** > > > > > > > > > > > > -- > > *Mike Tutkowski* > > *Senior CloudStack Developer, SolidFire Inc.***** > > > e: mike.tutkow...@solidfire.com > > o: 303.746.7302 > > Advancing the way the world uses the**** > > > cloud<http://solidfire.com/solution/overview/?video=play> > > *(tm)***** > > > > **** > > ** ** > > -- > *Mike Tutkowski***** > > *Senior CloudStack Developer, SolidFire Inc.***** > > e: mike.tutkow...@solidfire.com**** > > o: 303.746.7302**** > > Advancing the way the world uses the > cloud<http://solidfire.com/solution/overview/?video=play> > *™***** > -- *Mike Tutkowski* *Senior CloudStack Developer, SolidFire Inc.* e: mike.tutkow...@solidfire.com o: 303.746.7302 Advancing the way the world uses the cloud<http://solidfire.com/solution/overview/?video=play> *™*
