You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2013/09/04 20:52:50 UTC
[3/3] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.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/a17fac98
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a17fac98
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a17fac98
Branch: refs/heads/trunk
Commit: a17fac9840ab7cd4b797c2b2d3f8a8a51f0d6117
Parents: 67ea099 edc7531
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Wed Sep 4 21:52:26 2013 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Wed Sep 4 21:52:26 2013 +0300
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../org/apache/cassandra/cql3/QueryOptions.java | 2 ++
.../cql3/statements/CreateTriggerStatement.java | 8 +++-----
.../cql3/statements/DropTriggerStatement.java | 8 +++-----
.../org/apache/cassandra/service/ClientState.java | 6 ++++++
.../apache/cassandra/thrift/CassandraServer.java | 17 +++++++++++++++--
.../transport/messages/RegisterMessage.java | 2 +-
7 files changed, 31 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a17fac98/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a17fac98/src/java/org/apache/cassandra/thrift/CassandraServer.java
----------------------------------------------------------------------