On Wed, Aug 15, 2012 at 4:08 PM, Alex Huang <alex.hu...@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
