[1/7] git commit: Merge branch 'cassandra-1.1' into trunk

2012-10-22 Thread yukim
Updated Branches: refs/heads/cassandra-1.1 f22e2c459 -> 95fb613bf refs/heads/trunk a58b87020 -> dd8a3c450 Merge branch 'cassandra-1.1' into trunk Conflicts: src/java/org/apache/cassandra/service/StorageService.java src/java/org/apache/cassandra/thrift/CassandraServer.java P

[1/7] git commit: Merge branch 'cassandra-1.1' into trunk

2012-05-18 Thread brandonwilliams
Updated Branches: refs/heads/cassandra-1.1 fd92c09d9 -> 38748b43d refs/heads/trunk 71b38b094 -> 46b658f76 Merge branch 'cassandra-1.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/46b658f7 Tree: htt

[1/7] git commit: Merge branch 'cassandra-1.1' into trunk

2012-05-01 Thread brandonwilliams
Updated Branches: refs/heads/cassandra-1.1 f1ee34f08 -> 0529feb79 refs/heads/trunk 85a42a59d -> 13f695365 Merge branch 'cassandra-1.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/13f69536 Tree: htt

[1/7] git commit: Merge branch 'cassandra-1.1' into trunk

2012-04-25 Thread jbellis
Updated Branches: refs/heads/cassandra-1.1 7daa6625a -> 58dceaa6a refs/heads/trunk edf9e0e16 -> ea117154f Merge branch 'cassandra-1.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ea117154 Tree: htt

[1/7] git commit: Merge branch 'cassandra-1.1' into trunk

2012-04-17 Thread slebresne
Updated Branches: refs/heads/trunk 70523977c -> 1ec84642b Merge branch 'cassandra-1.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1ec84642 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree

[1/7] git commit: Merge branch 'cassandra-1.1' into trunk

2012-03-27 Thread brandonwilliams
Updated Branches: refs/heads/cassandra-1.1 8ac731efa -> 42a0a46a8 refs/heads/trunk b651778c4 -> e30febf25 Merge branch 'cassandra-1.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e30febf2 Tree: htt

[1/7] git commit: Merge branch 'cassandra-1.1' into trunk

2012-03-19 Thread brandonwilliams
Updated Branches: refs/heads/cassandra-1.1 c3690da4e -> 706787cfe refs/heads/trunk 78304fe24 -> ae62b54dd Merge branch 'cassandra-1.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ae62b54d Tree: htt

[1/7] git commit: Merge branch 'cassandra-1.1' into trunk

2012-02-28 Thread slebresne
Updated Branches: refs/heads/trunk e0d9ade44 -> 5c7ccb033 Merge branch 'cassandra-1.1' into trunk Conflicts: src/java/org/apache/cassandra/db/ColumnFamily.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/comm

[1/7] git commit: Merge branch 'cassandra-1.1' into trunk

2012-02-28 Thread brandonwilliams
Updated Branches: refs/heads/cassandra-1.1 d079c8204 -> 86d7c844c refs/heads/trunk d82814ae4 -> cc355ce6b Merge branch 'cassandra-1.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cc355ce6 Tree: htt