cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ble...@apache.org
Subject [3/3] cassandra git commit: Merge branch cassandra-3.0 into trunk
Date Thu, 17 Sep 2015 19:50:18 GMT
Merge branch cassandra-3.0 into trunk


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

Branch: refs/heads/trunk
Commit: d6d5698b8d04aad546174813f908a4e1a5752f73
Parents: 0bae803 caadcf6
Author: blerer <benjamin.lerer@datastax.com>
Authored: Thu Sep 17 21:48:20 2015 +0200
Committer: blerer <benjamin.lerer@datastax.com>
Committed: Thu Sep 17 21:48:48 2015 +0200

----------------------------------------------------------------------
 NEWS.txt                                        |  6 ++
 .../cassandra/cql3/BatchQueryOptions.java       | 28 ++++++++
 .../cassandra/cql3/ColumnSpecification.java     | 10 +++
 .../org/apache/cassandra/cql3/QueryOptions.java | 70 +++++++++++++++++++-
 .../cql3/statements/BatchStatement.java         |  2 +-
 .../cql3/statements/DropTableStatement.java     |  2 +-
 .../transport/messages/BatchMessage.java        |  2 +-
 .../transport/messages/ExecuteMessage.java      |  5 +-
 .../org/apache/cassandra/cql3/ViewTest.java     | 50 +++++++++++---
 .../cql3/validation/operations/BatchTest.java   | 10 +--
 10 files changed, 166 insertions(+), 19 deletions(-)
----------------------------------------------------------------------



Mime
View raw message