cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject [4/4] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.1
Date Thu, 26 Nov 2015 09:25:14 GMT
Merge branch 'cassandra-3.0' into cassandra-3.1


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

Branch: refs/heads/cassandra-3.1
Commit: 5fd65f3b7d18bb1fdf93906463bbd657cbea39c6
Parents: c2ea8c4 2cbd776
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Thu Nov 26 10:23:28 2015 +0100
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Thu Nov 26 10:23:28 2015 +0100

----------------------------------------------------------------------
 CHANGES.txt                                     |  1 +
 src/java/org/apache/cassandra/cql3/Json.java    | 25 +---------
 .../org/apache/cassandra/cql3/QueryOptions.java | 52 ++++++++++++++++++--
 .../apache/cassandra/cql3/QueryProcessor.java   | 40 ++++++++++++---
 .../cql3/statements/AlterKeyspaceStatement.java |  7 +--
 .../cql3/statements/AlterTableStatement.java    |  9 +---
 .../cql3/statements/AlterTypeStatement.java     |  9 +---
 .../cql3/statements/AlterViewStatement.java     |  9 +---
 .../statements/CreateAggregateStatement.java    | 27 +++-------
 .../statements/CreateFunctionStatement.java     | 23 +++------
 .../cql3/statements/CreateIndexStatement.java   |  8 +--
 .../statements/CreateKeyspaceStatement.java     | 11 ++---
 .../cql3/statements/CreateTableStatement.java   | 11 ++---
 .../cql3/statements/CreateTriggerStatement.java |  9 +---
 .../cql3/statements/CreateTypeStatement.java    | 11 ++---
 .../cql3/statements/CreateViewStatement.java    | 12 ++---
 .../cql3/statements/DropAggregateStatement.java | 19 ++-----
 .../cql3/statements/DropFunctionStatement.java  | 20 ++------
 .../cql3/statements/DropIndexStatement.java     | 41 +++++++--------
 .../cql3/statements/DropKeyspaceStatement.java  | 11 ++---
 .../cql3/statements/DropTableStatement.java     | 11 ++---
 .../cql3/statements/DropTriggerStatement.java   |  9 +---
 .../cql3/statements/DropTypeStatement.java      | 11 ++---
 .../cql3/statements/DropViewStatement.java      | 11 ++---
 .../statements/SchemaAlteringStatement.java     | 26 ++++------
 .../org/apache/cassandra/cql3/CQLTester.java    | 29 ++++++++++-
 .../validation/entities/SecondaryIndexTest.java |  9 ++++
 .../index/internal/CassandraIndexTest.java      |  8 +++
 28 files changed, 220 insertions(+), 249 deletions(-)
----------------------------------------------------------------------


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


Mime
View raw message