[4/5] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

2014-11-04 Thread tylerhobbs
Merge branch 'cassandra-2.0' into cassandra-2.1 Conflicts: test/unit/org/apache/cassandra/db/RangeTombstoneTest.java test/unit/org/apache/cassandra/db/SecondaryIndexCellSizeTest.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.o

[4/5] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

2014-10-23 Thread brandonwilliams
Merge branch 'cassandra-2.0' into cassandra-2.1 Conflicts: CHANGES.txt Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1467118f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1467118f Diff: http:/

[4/5] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

2014-10-02 Thread slebresne
Merge branch 'cassandra-2.0' into cassandra-2.1 Conflicts: CHANGES.txt src/java/org/apache/cassandra/serializers/ListSerializer.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/814e55af Tree: http:

[4/5] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

2014-08-28 Thread tylerhobbs
Merge branch 'cassandra-2.0' into cassandra-2.1 Conflicts: CHANGES.txt src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f294ece8

[4/5] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

2014-06-03 Thread aleksey
Merge branch 'cassandra-2.0' into cassandra-2.1 Conflicts: src/java/org/apache/cassandra/db/CounterMutation.java src/java/org/apache/cassandra/service/StorageProxy.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/c

[4/5] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

2014-05-28 Thread aleksey
Merge branch 'cassandra-2.0' into cassandra-2.1 Conflicts: CHANGES.txt Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/929eaa75 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/929eaa75 Diff: http:/

[4/5] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

2014-05-21 Thread slebresne
Merge branch 'cassandra-2.0' into cassandra-2.1 Conflicts: CHANGES.txt src/java/org/apache/cassandra/db/ColumnFamilyStore.java src/java/org/apache/cassandra/db/commitlog/CommitLogAllocator.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://

[4/5] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

2014-05-01 Thread slebresne
Merge branch 'cassandra-2.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e786101e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e786101e Diff: http://git-wip-us.apache.org/repos/asf

[4/5] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

2014-04-22 Thread aleksey
Merge branch 'cassandra-2.0' into cassandra-2.1 Conflicts: CHANGES.txt Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5045d3ea Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5045d3ea Diff: http:/

[4/5] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

2014-04-17 Thread aleksey
Merge branch 'cassandra-2.0' into cassandra-2.1 Conflicts: CHANGES.txt build.xml debian/changelog src/java/org/apache/cassandra/db/BatchlogManager.java src/java/org/apache/cassandra/db/ColumnFamilyStore.java src/java/org/apache/cassandra/db/HintedHan

[4/5] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

2014-04-01 Thread slebresne
Merge branch 'cassandra-2.0' into cassandra-2.1 Conflicts: src/java/org/apache/cassandra/db/filter/ColumnCounter.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/353b2147 Tree: http://git-wip-us.apache.org

[4/5] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

2014-03-27 Thread slebresne
Merge branch 'cassandra-2.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1f397a3d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1f397a3d Diff: http://git-wip-us.apache.org/repos/asf

[4/5] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

2014-03-22 Thread vijay
Merge branch 'cassandra-2.0' into cassandra-2.1 Conflicts: src/java/org/apache/cassandra/tools/NodeCmd.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fbc112d4 Tree: http://git-wip-us.apache.org/repos/asf

[4/5] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

2014-03-22 Thread vijay
Merge branch 'cassandra-2.0' into cassandra-2.1 Conflicts: src/java/org/apache/cassandra/tools/NodeCmd.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e955016e Tree: http://git-wip-us.apache.org/repos/asf

[4/5] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

2014-03-17 Thread slebresne
Merge branch 'cassandra-2.0' into cassandra-2.1 Conflicts: CHANGES.txt Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/67119a5a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/67119a5a Diff: http:/

[4/5] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

2014-03-12 Thread aleksey
Merge branch 'cassandra-2.0' into cassandra-2.1 Conflicts: CHANGES.txt 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/ad5169d2 Tree:

[4/5] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

2014-03-11 Thread vijay
Merge branch 'cassandra-2.0' into cassandra-2.1 Conflicts: src/java/org/apache/cassandra/tools/NodeCmd.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e22d0b1b Tree: http://git-wip-us.apache.org/repos/asf

[4/5] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

2014-03-08 Thread dbrosius
Merge branch 'cassandra-2.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5310f26d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5310f26d Diff: http://git-wip-us.apache.org/repos/asf

[4/5] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

2014-02-20 Thread slebresne
Merge branch 'cassandra-2.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/13b753b0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/13b753b0 Diff: http://git-wip-us.apache.org/repos/asf