[2/6] git commit: Merge branch 'cassandra-1.1.0' into cassandra-1.1

2012-04-18 Thread jbellis
Merge branch 'cassandra-1.1.0' into cassandra-1.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/991c2a25 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/991c2a25 Diff: http://git-wip-us.apache.org/repos/a

[2/6] git commit: Merge branch 'cassandra-1.1.0' into cassandra-1.1

2012-04-18 Thread brandonwilliams
Merge branch 'cassandra-1.1.0' into cassandra-1.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d992a93c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d992a93c Diff: http://git-wip-us.apache.org/repos/a

[2/6] git commit: Merge branch 'cassandra-1.1.0' into cassandra-1.1

2012-04-17 Thread slebresne
Merge branch 'cassandra-1.1.0' into cassandra-1.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7c50df3f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7c50df3f Diff: http://git-wip-us.apache.org/repos/a

[2/6] git commit: Merge branch 'cassandra-1.1.0' into cassandra-1.1

2012-04-16 Thread jbellis
Merge branch 'cassandra-1.1.0' into cassandra-1.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ac21a555 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ac21a555 Diff: http://git-wip-us.apache.org/repos/a

[2/6] git commit: Merge branch 'cassandra-1.1.0' into cassandra-1.1

2012-03-30 Thread brandonwilliams
Merge branch 'cassandra-1.1.0' into cassandra-1.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cd20c3a6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cd20c3a6 Diff: http://git-wip-us.apache.org/repos/a

[2/6] git commit: Merge branch 'cassandra-1.1.0' into cassandra-1.1

2012-03-26 Thread brandonwilliams
Merge branch 'cassandra-1.1.0' into cassandra-1.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b565fdbd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b565fdbd Diff: http://git-wip-us.apache.org/repos/a

[2/6] git commit: Merge branch 'cassandra-1.1.0' into cassandra-1.1

2012-03-20 Thread jbellis
Merge branch 'cassandra-1.1.0' into cassandra-1.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5787bb80 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5787bb80 Diff: http://git-wip-us.apache.org/repos/a

[2/6] git commit: Merge branch 'cassandra-1.1.0' into cassandra-1.1

2012-03-16 Thread jbellis
Merge branch 'cassandra-1.1.0' into cassandra-1.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/68491930 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/68491930 Diff: http://git-wip-us.apache.org/repos/a

[2/6] git commit: Merge branch 'cassandra-1.1.0' into cassandra-1.1

2012-03-13 Thread jbellis
Merge branch 'cassandra-1.1.0' into cassandra-1.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/add6724b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/add6724b Diff: http://git-wip-us.apache.org/repos/a

[2/6] git commit: Merge branch 'cassandra-1.1.0' into cassandra-1.1

2012-03-13 Thread jbellis
Merge branch 'cassandra-1.1.0' into cassandra-1.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b887edf1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b887edf1 Diff: http://git-wip-us.apache.org/repos/a

[2/6] git commit: Merge branch 'cassandra-1.1.0' into cassandra-1.1

2012-03-04 Thread slebresne
Merge branch 'cassandra-1.1.0' into cassandra-1.1 Conflicts: src/java/org/apache/cassandra/service/StorageService.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6e5722d7 Tree: http://git-wip-us.apache.or

[2/6] git commit: Merge branch 'cassandra-1.1.0' into cassandra-1.1

2012-03-01 Thread jbellis
Merge branch 'cassandra-1.1.0' into cassandra-1.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/84326c76 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/84326c76 Diff: http://git-wip-us.apache.org/repos/a

[2/6] git commit: Merge branch 'cassandra-1.1.0' into cassandra-1.1

2012-02-27 Thread jbellis
Merge branch 'cassandra-1.1.0' into cassandra-1.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/449e0371 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/449e0371 Diff: http://git-wip-us.apache.org/repos/a