Mailing-List: contact cloudstack-dev-help@incubator.apache.org; run by ezmlm
Precedence: bulk
Reply-To: cloudstack-dev@incubator.apache.org
Received-SPF: neutral (athena.apache.org: local policy)
MIME-Version: 1.0
In-Reply-To: 
 <B1DF26ECC0458748AC97CECE2DA98D41012F9EB389B1@SJCPMAILBOX01.citrite.net>
References: 
 <B1DF26ECC0458748AC97CECE2DA98D41012F9EB389B1@SJCPMAILBOX01.citrite.net>
From: David Nalley <david@gnsa.us>
Date: Wed, 15 Aug 2012 16:12:30 -0400
Message-ID: 
 <CAKprHVZSYrUNAyULqX_6WBmEwr4qVS4vokWdWLJHu1QUfJ3=mA@mail.gmail.com>
Subject: Re: [ASFCS40]merges to 4.0
To: cloudstack-dev@incubator.apache.org
Content-Type: text/plain; charset=ISO-8859-1

On Wed, Aug 15, 2012 at 4:08 PM, Alex Huang <Alex.Huang@citrix.com> wrote:
> I've completed merges to 4.0 from master up to commit 95a60dc8bc7dbda2c83d48cb47ed77a765b984f8.
>
> I did not include the following commits:
>
> dc07b2e3e616d6f945b8e85756c9f3a4f72b2fec  - Brian Federle : There's a merge conflict and I don't understand java script enough to resolve it.  Brian, please resolve it.
>
> 7e093a949d2445d320b1fba330ad802dc14db1b8 - Mice Xia: This change would change behavior of CloudStack.  Please submit comments about what testing were done or if it doesn't change behavior, please comment on why.
>
> --Alex

Alex:

Can you look at  fe3786341f1409034d6acd3a7ce4a3b3d7cabc84 - I don't
see that in the list of commits to 4.0 and it resolves some unit test
failures (4.0 has 6 unittest failures at present while master has only
2)

--David