Everyone, We started having a few stuffs stacking up for 1.2 so it was time to create a branch for it. So I've created a cassandra-1.1.0 branch for the 1.1.0 release.
In other words, the merges are now: - commit to cassandra-1.0 => merge against cassandra-1.1.0 then cassandra-1.1 then trunk - For 1.1.0 patches: commit to cassandra-1.1.0 then merge against cassandra-1.1 then trunk - For 1.1.1 patches: commit to cassandra-1.1 then trunk - For 1.2 patches: commit to trunk Once 1.1.0 is release we'll just remove the cassandra-1.1.0 branch and continue dev on cassandra-1.1. P.S: all branches should be up to date, i.e. I have merge trunk against cassandra-1.1 after having created cassandra-1.1.0 (since trunk was the old 1.1.1). But if you spot a mistake on my part, please tell me.