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

2014-02-01 Thread aleksey
Merge branch 'cassandra-2.0' into trunk Conflicts: build.xml src/java/org/apache/cassandra/db/compaction/PrecompactedRow.java src/java/org/apache/cassandra/db/context/CounterContext.java test/unit/org/apache/cassandra/db/RangeTombstoneTest.java Project: http://git

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

2013-11-27 Thread jbellis
Merge branch 'cassandra-2.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/57e959d8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/57e959d8 Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

2013-11-26 Thread jbellis
Merge branch 'cassandra-2.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c1d7291c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c1d7291c Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

2013-11-18 Thread slebresne
Merge branch 'cassandra-2.0' into trunk Conflicts: src/java/org/apache/cassandra/cql3/statements/SelectStatement.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/542d9c8d Tree: http://git-wip-us.apache.org

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

2013-10-24 Thread brandonwilliams
Merge branch 'cassandra-2.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fb7e0b1c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fb7e0b1c Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

2013-10-08 Thread brandonwilliams
Merge branch 'cassandra-2.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3f918e23 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3f918e23 Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

2013-08-31 Thread jbellis
Merge branch 'cassandra-2.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7a0618c2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7a0618c2 Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

2013-08-30 Thread jbellis
Merge branch 'cassandra-2.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ca037b08 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ca037b08 Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

2013-08-29 Thread aleksey
Merge branch 'cassandra-2.0' into trunk Conflicts: src/java/org/apache/cassandra/service/StorageService.java tools/stress/src/org/apache/cassandra/stress/Session.java tools/stress/src/org/apache/cassandra/stress/StressStatistics.java Project: http://git-wip-us.apache.org/

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

2013-08-09 Thread aleksey
Merge branch 'cassandra-2.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9bc8fa2a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9bc8fa2a Diff: http://git-wip-us.apache.org/repos/asf/cassand