>
> We are requesting merge from javelin to master. We have merged all
> changes from master as of 1/24/2013. Will do another merge to make sure
> javelin is updated once it's passed the 72 hours.
>
> The content of the merge is the storage framework refactoring and
> converting everything use Spring. The storage refactoring is put in as an
> independent piece that is not hooked into CloudStack yet. Edison is working
> on the hookins in another branch. We like to get this into 4.1 because
> several
> of the components added to Cloudstack will require the Spring framework or
> they have to be redone.
>
> Javelin has been checked with marvin integration testing to make sure the
> server behaves the same. skipTests has been turned off and the unit tests
> are running clean. Non-oss is also converted over but there might be a small
> issue with VmWare. Usage and awsapi also have small issues but we believe
> we can fix those within the 72 hour waiting period.
>
> --Alex
