cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject [4/4] git commit: Merge branch 'cassandra-2.1' into trunk
Date Wed, 02 Apr 2014 12:02:43 GMT
Merge branch 'cassandra-2.1' into trunk

Conflicts:
	src/java/org/apache/cassandra/cql/QueryProcessor.java


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/04f74a91
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/04f74a91
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/04f74a91

Branch: refs/heads/trunk
Commit: 04f74a915c41bb7b7263c0ec2304e2d0f7f105c0
Parents: 2eecd40 8afe109
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Wed Apr 2 14:02:31 2014 +0200
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Wed Apr 2 14:02:31 2014 +0200

----------------------------------------------------------------------
 CHANGES.txt                                     |  1 +
 .../org/apache/cassandra/config/CFMetaData.java | 39 +++++-------
 .../cassandra/config/ColumnDefinition.java      |  9 +++
 .../apache/cassandra/cql3/QueryProcessor.java   |  4 +-
 .../cassandra/thrift/ThriftValidation.java      |  5 +-
 .../apache/cassandra/tools/SSTableImport.java   |  2 +-
 .../unit/org/apache/cassandra/SchemaLoader.java |  7 ++-
 .../unit/org/apache/cassandra/db/ScrubTest.java | 65 ++++++++++++++++++++
 .../cassandra/thrift/ThriftValidationTest.java  | 53 ++++++++++++++--
 .../cassandra/tools/SSTableExportTest.java      | 35 +++++++++++
 10 files changed, 187 insertions(+), 33 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/04f74a91/CHANGES.txt
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/04f74a91/src/java/org/apache/cassandra/config/CFMetaData.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/04f74a91/src/java/org/apache/cassandra/config/ColumnDefinition.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/04f74a91/src/java/org/apache/cassandra/cql3/QueryProcessor.java
----------------------------------------------------------------------


Mime
View raw message