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

2015-01-30 Thread tylerhobbs
Merge branch 'cassandra-2.0' into cassandra-2.1 Conflicts: src/java/org/apache/cassandra/config/CFMetaData.java src/java/org/apache/cassandra/cql3/statements/CreateTableStatement.java src/java/org/apache/cassandra/db/marshal/CounterColumnType.java Project:

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

2015-01-14 Thread slebresne
Merge branch 'cassandra-2.0' into cassandra-2.1 Conflicts: src/java/org/apache/cassandra/db/columniterator/IndexedSliceReader.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cf07fc25 Tree:

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

2014-11-27 Thread aleksey
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9aaea248/src/java/org/apache/cassandra/tools/NodeTool.java -- diff --cc src/java/org/apache/cassandra/tools/NodeTool.java index 1db0245,000..fe4535b mode

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

2014-11-24 Thread aleksey
Merge branch 'cassandra-2.0' into cassandra-2.1 Conflicts: CHANGES.txt src/java/org/apache/cassandra/cql3/CFDefinition.java src/java/org/apache/cassandra/cql3/ColumnNameBuilder.java src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java

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

2014-11-19 Thread tylerhobbs
http://git-wip-us.apache.org/repos/asf/cassandra/blob/25a4c9e1/test/unit/org/apache/cassandra/cql3/MultiColumnRelationTest.java -- diff --cc test/unit/org/apache/cassandra/cql3/MultiColumnRelationTest.java index