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/c5bc8114
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c5bc8114
Diff:
Merge branch 'cassandra-2.1' into trunk
Conflicts:
test/long/org/apache/cassandra/db/compaction/LongLeveledCompactionStrategyTest.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cf6f7c16
Tree:
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/9a2cae69
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9a2cae69
Diff:
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/5893472e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5893472e
Diff:
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/e9d1e799
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e9d1e799
Diff:
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/e2515790
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e2515790
Diff:
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/81c93084
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/81c93084
Diff:
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/2da468d9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2da468d9
Diff:
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/3cb00db3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3cb00db3
Diff:
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/6b127679
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6b127679
Diff:
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/435827d1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/435827d1
Diff:
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/afb52aa9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/afb52aa9
Diff:
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/e28860b4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e28860b4
Diff:
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/6404e015
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6404e015
Diff:
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/90476352
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/90476352
Diff:
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/e6bc6385
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e6bc6385
Diff:
Merge branch 'cassandra-2.1' into trunk
Conflicts:
src/java/org/apache/cassandra/cql3/Lists.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6ad452e4
Tree:
Merge branch 'cassandra-2.1' into trunk
Conflicts:
bin/cqlsh
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/840d9a66
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/840d9a66
Diff:
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/b379e326
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b379e326
Diff:
Merge branch 'cassandra-2.1' into trunk
Conflicts:
CHANGES.txt
test/unit/org/apache/cassandra/cql3/UserTypesTest.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5f663f54
Tree:
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/a43e43f0
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a43e43f0
Diff:
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/0f72f79d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0f72f79d
Diff:
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/a053d9e0
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a053d9e0
Diff:
Merge branch 'cassandra-2.1' into trunk
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/2e4c7a5a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2e4c7a5a
Diff:
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/cbb982cc
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cbb982cc
Diff:
Merge branch 'cassandra-2.1' into trunk
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/f9693d54
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f9693d54
Diff:
Merge branch 'cassandra-2.1' into trunk
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/47a4cbed
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/47a4cbed
Diff:
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/adcb8a43
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/adcb8a43
Diff:
Merge branch 'cassandra-2.1' into trunk
Conflicts:
src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/57e1a265
Tree:
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/1b0a59e2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1b0a59e2
Diff:
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/a7b5df6b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a7b5df6b
Diff:
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/addba6b5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/addba6b5
Diff:
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/61e063b0
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/61e063b0
Diff:
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/cc0247b1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cc0247b1
Diff:
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/04f351d5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/04f351d5
Diff:
Merge branch 'cassandra-2.1' into trunk
Conflicts:
src/java/org/apache/cassandra/io/sstable/IndexSummaryBuilder.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/db900a37
Tree:
Merge branch 'cassandra-2.1' into trunk
Conflicts:
src/java/org/apache/cassandra/cql3/Cql.g
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2989edb3
Tree:
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/5d9574fc
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5d9574fc
Diff:
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/966ff215
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/966ff215
Diff:
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/1faca1cb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1faca1cb
Diff:
Merge branch 'cassandra-2.1' into trunk
Conflicts:
src/java/org/apache/cassandra/db/compaction/LazilyCompactedRow.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6633421d
Tree:
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/bee47462
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bee47462
Diff:
Merge branch 'cassandra-2.1' into trunk
Conflicts:
bin/cqlsh
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/237d0bc6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/237d0bc6
Diff:
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/850b5d0d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/850b5d0d
Diff:
Merge branch 'cassandra-2.1' into trunk
Conflicts:
src/java/org/apache/cassandra/gms/Gossiper.java
src/java/org/apache/cassandra/transport/Server.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit:
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/482cbc0c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/482cbc0c
Diff:
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/a64f4143
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a64f4143
Diff:
Merge branch 'cassandra-2.1' into trunk
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/5d6f9284
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5d6f9284
Diff:
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/f843b42e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f843b42e
Diff:
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/87d56d12
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/87d56d12
Diff:
Merge branch 'cassandra-2.1' into trunk
Conflicts:
tools/stress/src/org/apache/cassandra/stress/settings/OptionDistribution.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a0586f69
Tree:
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/9eebe874
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9eebe874
Diff:
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/b426963e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b426963e
Diff:
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/3a44b4c6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3a44b4c6
Diff:
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/4a1879c2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4a1879c2
Diff:
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/b2d16f4c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b2d16f4c
Diff:
Merge branch 'cassandra-2.1' into trunk
Conflicts:
NEWS.txt
test/unit/org/apache/cassandra/db/compaction/SizeTieredCompactionStrategyTest.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b5b1af70
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/b2dfe1be
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b2dfe1be
Diff:
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/89d31f3d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/89d31f3d
Diff:
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/dd825a5f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dd825a5f
Diff:
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/0014d929
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0014d929
Diff:
Merge branch 'cassandra-2.1' into trunk
Conflicts:
src/java/org/apache/cassandra/db/compaction/CompactionManager.java
src/java/org/apache/cassandra/service/ActiveRepairService.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit:
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/4807f129
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4807f129
Diff:
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/b944f0d6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b944f0d6
Diff:
Merge branch 'cassandra-2.1' into trunk
Conflicts:
build.xml
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ea3ff25a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ea3ff25a
Diff:
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/0af528b9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0af528b9
Diff:
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/187624b1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/187624b1
Diff:
Merge branch 'cassandra-2.1' into trunk
Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/config/CFMetaData.java
src/java/org/apache/cassandra/db/DataTracker.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit:
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/4231b4e2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4231b4e2
Diff:
Merge branch 'cassandra-2.1' into trunk
Conflicts:
src/java/org/apache/cassandra/config/CFMetaData.java
src/java/org/apache/cassandra/config/KSMetaData.java
src/java/org/apache/cassandra/db/SystemKeyspace.java
Project:
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/f161318f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f161318f
Diff:
Merge branch 'cassandra-2.1' into trunk
Conflicts:
build.xml
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0b324c5e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0b324c5e
Diff:
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/caa03595
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/caa03595
Diff:
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/25b18b75
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/25b18b75
Diff:
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/6145d50f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6145d50f
Diff:
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/d76450c7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d76450c7
Diff:
Merge branch 'cassandra-2.1' into trunk
Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/db/compaction/SizeTieredCompactionStrategy.java
src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Merge branch 'cassandra-2.1' into trunk
Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/config/ColumnDefinition.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bbb1592e
Tree:
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/7b533d06
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7b533d06
Diff:
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/10b8a765
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/10b8a765
Diff:
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/8f51b8aa
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8f51b8aa
Diff:
Merge branch 'cassandra-2.1' into trunk
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/184bb65f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/184bb65f
Diff:
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/5d3c2c98
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5d3c2c98
Diff:
Merge branch 'cassandra-2.1' into trunk
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/0c3720ab
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0c3720ab
Diff:
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/37f12789
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/37f12789
Diff:
Merge branch 'cassandra-2.1' into trunk
Conflicts:
src/java/org/apache/cassandra/db/compaction/CompactionManager.java
src/java/org/apache/cassandra/repair/RepairMessageVerbHandler.java
src/java/org/apache/cassandra/service/ActiveRepairService.java
Project:
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/6f51e35f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6f51e35f
Diff:
Merge branch 'cassandra-2.1' into trunk
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/a792a7ba
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a792a7ba
Diff:
Merge branch 'cassandra-2.1' into trunk
Conflicts:
src/java/org/apache/cassandra/service/AbstractReadExecutor.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9c6cf3cd
Tree:
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/b66a547a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b66a547a
Diff:
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/a6ae07f1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a6ae07f1
Diff:
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/076b5bdd
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/076b5bdd
Diff:
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/270a05d6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/270a05d6
Diff:
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/c65a9f5c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c65a9f5c
Diff:
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/30a5597c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/30a5597c
Diff:
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/3b945483
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3b945483
Diff:
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/c04c50c9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c04c50c9
Diff:
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/d1a552dd
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d1a552dd
Diff:
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/49dea419
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/49dea419
Diff:
Merge branch 'cassandra-2.1' 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/66348bbe
Tree:
1 - 100 of 149 matches
Mail list logo