three pulled, i noticed windows line endings and trailing space in server/test/resources/createNetworkOffering.xml please take care.
On Fri, Jun 6, 2014 at 4:57 AM, Alena Prokharchyk <[email protected]> wrote: > And one more – fixing the unit test (sorry for that) > > commit 96bfa8a73f0054db42beaff6a8ba3af058d3d915 > Author: Alena Prokharchyk <[email protected]> > Date: Thu Jun 5 18:20:33 2014 -0700 > > Fixed unittest > > -Alena. > > From: Alena Prokharchyk <[email protected]> > Date: Thursday, June 5, 2014 at 5:45 PM > To: Daan Hoogland <[email protected]> > Cc: "[email protected]" <[email protected]> > Subject: [ACS44] Cherry pick for CLOUDSTACK-6676 and CLOUDSTACK-6853 > > Daan, can you please cherry-pick the commits below to 4.4 branch? Thank you! > > commit 66df43572e1a12ad2bd32f8c0aa9acaeb271828e > Author: Alena Prokharchyk <[email protected]> > Date: Thu Jun 5 17:26:01 2014 -0700 > > CLOUDSTACK-6676: cleanup ip address details on ip disassoc > > commit 03623fe57e6597782b628815140283151d066a36 > Author: Alena Prokharchyk <[email protected]> > Date: Thu Jun 5 17:07:52 2014 -0700 > > CLOUDSTACK-6853: Search for non-removed nics only when check if the > running vm belongs to a certain network > > > -Alena. -- Daan
