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:
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b0c9b8f6/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java
--
diff --cc
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:
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
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
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
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
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
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:
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:
10 matches
Mail list logo