cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brandonwilli...@apache.org
Subject [1/7] git commit: Merge branch 'cassandra-1.1' into trunk
Date Fri, 18 May 2012 15:33:25 GMT
Updated Branches:
  refs/heads/cassandra-1.1 fd92c09d9 -> 38748b43d
  refs/heads/trunk 71b38b094 -> 46b658f76


Merge branch 'cassandra-1.1' into trunk


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

Branch: refs/heads/trunk
Commit: 46b658f762ae2f1dd409bb19e18c43f7b07d80e6
Parents: 71b38b0 38748b4
Author: Brandon Williams <brandonwilliams@apache.org>
Authored: Fri May 18 10:32:55 2012 -0500
Committer: Brandon Williams <brandonwilliams@apache.org>
Committed: Fri May 18 10:32:55 2012 -0500

----------------------------------------------------------------------
 CHANGES.txt                                        |    2 +
 bin/cqlsh                                          |  487 ++++---
 interface/cassandra.thrift                         |    5 +-
 .../org/apache/cassandra/thrift/Cassandra.java     |  352 +++---
 .../org/apache/cassandra/thrift/Constants.java     |    2 +-
 .../apache/cassandra/thrift/CqlPreparedResult.java |  139 ++-
 pylib/cqlshlib/cql3handling.py                     |  690 +++++++++-
 pylib/cqlshlib/cqlhandling.py                      | 1049 +++++++--------
 pylib/cqlshlib/pylexotron.py                       |   30 +-
 pylib/cqlshlib/util.py                             |   74 +
 .../org/apache/cassandra/cql3/QueryProcessor.java  |   19 +-
 .../cassandra/cql3/statements/BatchStatement.java  |   10 +-
 .../cassandra/cql3/statements/DeleteStatement.java |   10 +-
 .../cql3/statements/ModificationStatement.java     |    2 +-
 .../cassandra/cql3/statements/ParsedStatement.java |    8 +-
 .../cassandra/cql3/statements/SelectStatement.java |   24 +-
 .../cassandra/cql3/statements/UpdateStatement.java |   18 +-
 17 files changed, 1874 insertions(+), 1047 deletions(-)
----------------------------------------------------------------------


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

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/46b658f7/src/java/org/apache/cassandra/cql3/statements/BatchStatement.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/46b658f7/src/java/org/apache/cassandra/cql3/statements/DeleteStatement.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/46b658f7/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/46b658f7/src/java/org/apache/cassandra/cql3/statements/ParsedStatement.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/46b658f7/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/46b658f7/src/java/org/apache/cassandra/cql3/statements/UpdateStatement.java
----------------------------------------------------------------------


Mime
View raw message