Seems not everyone remembers this email about the branch.
In short - 2.1.x branch is for *all* 2.1, including GA.
Trunk is for future dev, which will be 2.2 or maybe even 3.0 since I hope we will base
that on Ganymede.
In case you missed it in the svn commit logs a branch where created for 2.1.x and CR1 was
That means if something needs to go into the final 2.1 you need to commit it in the
Please make sure when you resolve in jira you set the right fix versions! (tip: you can
select multiple with Ctrl key ;)