[1/10] git commit: Merge branch 'cassandra-1.2' into trunk

2012-12-19 Thread yukim
Updated Branches: refs/heads/cassandra-1.2 de2495c2c - f25284220 refs/heads/cassandra-1.2.0 e2715f9ea - 45310c068 refs/heads/trunk ff92111c0 - 1e80bb899 Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit:

[1/10] git commit: Merge branch 'cassandra-1.2' into trunk

2012-12-18 Thread jbellis
Updated Branches: refs/heads/cassandra-1.1 4885bfccf - 134e8c78d refs/heads/cassandra-1.2 a6d4f7a4e - 9fdccd768 refs/heads/cassandra-1.2.0 d67816bee - fb9ad748d refs/heads/trunk 77fb2080f - 0febf44d5 Merge branch 'cassandra-1.2' into trunk Project:

[1/10] git commit: Merge branch 'cassandra-1.2' into trunk

2012-12-13 Thread jbellis
Updated Branches: refs/heads/cassandra-1.1 ca02176fc - 3e27a320b refs/heads/cassandra-1.2 158376963 - aa8828a27 refs/heads/cassandra-1.2.0 1bb78b0c4 - 347461375 refs/heads/trunk d173ab51a - 803bbeb0d Merge branch 'cassandra-1.2' into trunk Project:

[1/10] git commit: Merge branch 'cassandra-1.2' into trunk

2012-12-10 Thread jbellis
Updated Branches: refs/heads/cassandra-1.1 5b511b621 - 6b8a0d9f1 refs/heads/cassandra-1.2 956fa7768 - eeb7965db refs/heads/cassandra-1.2.0 dbbca5e29 - cb45b4149 refs/heads/trunk ea4f28505 - 69e6c0b8b Merge branch 'cassandra-1.2' into trunk Project:

[1/10] git commit: Merge branch 'cassandra-1.2' into trunk

2012-12-08 Thread aleksey
Updated Branches: refs/heads/trunk 36389f7d8 - 253a7f028 Merge branch 'cassandra-1.2' into trunk Conflicts: src/java/org/apache/cassandra/service/StorageService.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit:

[1/10] git commit: Merge branch 'cassandra-1.2' into trunk

2012-12-07 Thread yukim
Updated Branches: refs/heads/cassandra-1.1 8d55474fe - 1ac90589e refs/heads/cassandra-1.2 fc416fab0 - 0934bffa1 refs/heads/cassandra-1.2.0 bac979410 - 8581be8a2 refs/heads/trunk f8f80d3e5 - 5a7943da4 Merge branch 'cassandra-1.2' into trunk Project:

[1/10] git commit: Merge branch 'cassandra-1.2' into trunk

2012-12-06 Thread jbellis
Updated Branches: refs/heads/cassandra-1.1 5abeecc8b - 8d55474fe refs/heads/cassandra-1.2 12948f652 - 32b842b13 refs/heads/cassandra-1.2.0 7322f8238 - b537567b3 refs/heads/trunk fa9c54ef6 - 6c3e437ab Merge branch 'cassandra-1.2' into trunk Project:

[1/10] git commit: Merge branch 'cassandra-1.2' into trunk

2012-12-04 Thread jbellis
Updated Branches: refs/heads/cassandra-1.1 32135741b - 2e271233f refs/heads/cassandra-1.2 b475602be - b58e1b853 refs/heads/cassandra-1.2.0 91f36f6dc - 66026510d refs/heads/trunk 55aefb007 - b57d25020 Merge branch 'cassandra-1.2' into trunk Project: