[2/3] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

Merge branch 'cassandra-2.0' into cassandra-2.1.0 Conflicts: src/java/org/apache/cassandra/config/CFMetaData.java src/java/org/apache/cassandra/cql3/statements/CreateTableStatement.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit:

[2/3] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

Merge branch 'cassandra-2.0' into cassandra-2.1.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0de4135f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0de4135f Diff:

[2/3] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

Merge branch 'cassandra-2.0' into cassandra-2.1.0 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/69a25cd0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/69a25cd0 Diff:

[2/3] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

Merge branch 'cassandra-2.0' into cassandra-2.1.0 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/cb4bc276 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cb4bc276 Diff:

[2/3] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

Merge branch 'cassandra-2.0' into cassandra-2.1.0 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/63c21a32 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/63c21a32 Diff:

[2/3] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

Merge branch 'cassandra-2.0' into cassandra-2.1.0 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/889f3ac5

[2/3] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

Merge branch 'cassandra-2.0' into cassandra-2.1.0 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/39b81967 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/39b81967 Diff:

[2/3] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

Merge branch 'cassandra-2.0' into cassandra-2.1.0 Conflicts: CHANGES.txt src/java/org/apache/cassandra/db/DataTracker.java src/java/org/apache/cassandra/db/Memtable.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit:

[2/3] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

Merge branch 'cassandra-2.0' into cassandra-2.1.0 Conflicts: CHANGES.txt test/unit/org/apache/cassandra/cql3/TypeTest.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d3450570 Tree:

[2/3] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

Merge branch 'cassandra-2.0' into cassandra-2.1.0 Conflicts: CHANGES.txt src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/579222e9

[2/3] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

Merge branch 'cassandra-2.0' into cassandra-2.1.0 Conflicts: CHANGES.txt src/java/org/apache/cassandra/config/CFMetaData.java src/java/org/apache/cassandra/cql3/statements/CreateTableStatement.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit:

[2/3] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

Merge branch 'cassandra-2.0' into cassandra-2.1.0 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/e9d0214a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e9d0214a Diff:

[2/3] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

Merge branch 'cassandra-2.0' into cassandra-2.1.0 Conflicts: CHANGES.txt 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/0623ea86 Tree:

[2/3] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

Merge branch 'cassandra-2.0' into cassandra-2.1.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3e2e4dd9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3e2e4dd9 Diff:

[2/3] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

Merge branch 'cassandra-2.0' into cassandra-2.1.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bb55843c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bb55843c Diff:

[2/3] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

Merge branch 'cassandra-2.0' into cassandra-2.1.0 Conflicts: CHANGES.txt 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/commit/fbe7b909 Tree:

[2/3] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

Merge branch 'cassandra-2.0' into cassandra-2.1.0 Conflicts: CHANGES.txt pylib/cqlshlib/test/test_cqlsh_output.py pylib/cqlshlib/test/test_keyspace_init.cql Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit:

[2/3] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

Merge branch 'cassandra-2.0' into cassandra-2.1.0 Conflicts: CHANGES.txt src/java/org/apache/cassandra/thrift/CassandraServer.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ef08f949 Tree:

[2/3] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

Merge branch 'cassandra-2.0' into cassandra-2.1.0 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/4c387e46 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4c387e46 Diff:

[2/3] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

Merge branch 'cassandra-2.0' into cassandra-2.1.0 Conflicts: src/java/org/apache/cassandra/config/CFMetaData.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/228f0ade Tree:

[2/3] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

Merge branch 'cassandra-2.0' into cassandra-2.1.0 Conflicts: CHANGES.txt src/java/org/apache/cassandra/tools/SSTableExport.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/eea547c6 Tree:

[2/3] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

Merge branch 'cassandra-2.0' into cassandra-2.1.0 Conflicts: CHANGES.txt src/java/org/apache/cassandra/db/index/AbstractSimplePerColumnSecondaryIndex.java src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java Project:

[2/3] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

Merge branch 'cassandra-2.0' into cassandra-2.1.0 Conflicts: CHANGES.txt build.xml Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/95d289b8 Tree:

[2/3] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

Merge branch 'cassandra-2.0' into cassandra-2.1.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5f4cd8a5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5f4cd8a5 Diff:

[2/3] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

Merge branch 'cassandra-2.0' into cassandra-2.1.0 Conflicts: CHANGES.txt src/java/org/apache/cassandra/db/ColumnFamilyStore.java src/java/org/apache/cassandra/db/DataTracker.java test/unit/org/apache/cassandra/db/CommitLogTest.java Project:

[2/3] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

Merge branch 'cassandra-2.0' into cassandra-2.1.0 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/ef099c31 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ef099c31 Diff:

[2/3] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

Merge branch 'cassandra-2.0' into cassandra-2.1.0 Conflicts: test/unit/org/apache/cassandra/service/MoveTest.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/85bcd2d7 Tree:

[2/3] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

Merge branch 'cassandra-2.0' into cassandra-2.1.0 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/c4d23e16 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c4d23e16 Diff:

[2/3] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

Merge branch 'cassandra-2.0' into cassandra-2.1.0 Conflicts: CHANGES.txt src/java/org/apache/cassandra/db/Memtable.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/65a4f5dc Tree:

[2/3] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

Merge branch 'cassandra-2.0' into cassandra-2.1.0 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/72676dd4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/72676dd4 Diff:

[2/3] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

Merge branch 'cassandra-2.0' into cassandra-2.1.0 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/e740c297 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e740c297 Diff:

[2/3] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

Merge branch 'cassandra-2.0' into cassandra-2.1.0 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/ce46d661

[2/3] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

Merge branch 'cassandra-2.0' into cassandra-2.1.0 Conflicts: CHANGES.txt NEWS.txt src/java/org/apache/cassandra/db/compaction/LeveledManifest.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit:

[2/3] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

Merge branch 'cassandra-2.0' into cassandra-2.1.0 Conflicts: src/java/org/apache/cassandra/cql3/statements/ColumnGroupMap.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0bbfabb5 Tree: