[3/4] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

2015-05-04 Thread benedict
Merge branch 'cassandra-2.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/26249326 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/26249326 Diff:

[3/4] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

2015-04-15 Thread marcuse
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b0c9b8f6/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java -- diff --cc

[3/4] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

2015-03-18 Thread benedict
Merge branch 'cassandra-2.1' into trunk Conflicts: src/java/org/apache/cassandra/config/Config.java src/java/org/apache/cassandra/config/DatabaseDescriptor.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit:

[3/4] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

2015-03-18 Thread benedict
http://git-wip-us.apache.org/repos/asf/cassandra/blob/abd528a0/src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java -- diff --cc src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java index

[3/4] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

2015-03-04 Thread benedict
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e473ce06/src/java/org/apache/cassandra/io/sstable/format/big/BigTableWriter.java -- diff --cc src/java/org/apache/cassandra/io/sstable/format/big/BigTableWriter.java index

[3/4] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

2015-02-11 Thread benedict
http://git-wip-us.apache.org/repos/asf/cassandra/blob/96866ce5/src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java -- diff --cc src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java index

[3/4] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

2015-02-11 Thread benedict
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6d12ab8f/src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java -- diff --cc src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java index

[3/4] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

2015-02-10 Thread tylerhobbs
http://git-wip-us.apache.org/repos/asf/cassandra/blob/fbc38cd3/src/java/org/apache/cassandra/cql3/restrictions/StatementRestrictions.java -- diff --cc src/java/org/apache/cassandra/cql3/restrictions/StatementRestrictions.java

[3/4] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

2014-11-24 Thread marcuse
Merge branch 'cassandra-2.1' into trunk Conflicts: src/java/org/apache/cassandra/db/compaction/CompactionTask.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cd4f729e Tree:

[3/4] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

2014-11-13 Thread yukim
Merge branch 'cassandra-2.1' into trunk Conflicts: src/java/org/apache/cassandra/service/ActiveRepairService.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f4456a27 Tree: