1.1 Release dates and Rollbacking "History storage" patch

Hi, We've just committed the patch for XWIKI-1459 yesterday. However we may need to rollback it. Let me explain the situation: 1) It's a big and dangerous patch 2) The Curriki project is currently building on top of XWiki trunk and they're doing some important release soon. 3) They understand that using XWiki trunk is risky and they're going to branch off xwiki trunk real soon (I heard it's planned for next week) 4) They have some test server and it seems the recent commit broke a few things. No investigations done yet. As a consequence, they're asking us if we could rollback that patch and release 1.1M4 without it so that they can branch at 1.1M4. We can then apply the patch after. The problem is that 1.1M4 was supposed to be our last release with new features and 1.1M5/M6 were supposed to be 1.1RC1/RC2 till the final release planned for the 3rd of September. I don't think we'll be able to release a good 1.1 version if we only have one release for hunting down bug fixes. I also think Curriki is right in that committing such a big change one or 2 days before a release is asking for trouble... Thus I'd like to propose the following: A) We rollback the patch and release 1.1M4 without it B) We shift the final 1.1 release by 15 days - New date: 17th of September. We add one release: 1.1M5 and then 1.1RC1 and 1.1RC2 C) We add this patch in 1.1M5. However we don't generally allow any other important change unless there's a good reason. I.e. we consider 1.1M5 almost like a RC except for this patch WDYT? Thanks -Vincent