You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by mi...@apache.org on 2014/09/01 21:21:22 UTC
[8/8] git commit: Merge branch 'cassandra-2.1' into trunk
Merge branch 'cassandra-2.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/873d0649
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/873d0649
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/873d0649
Branch: refs/heads/trunk
Commit: 873d0649089c31e8216957762c33c6bc78466fb6
Parents: 54e7f96 e0d7c77
Author: Mikhail Stepura <mi...@apache.org>
Authored: Mon Sep 1 12:20:30 2014 -0700
Committer: Mikhail Stepura <mi...@apache.org>
Committed: Mon Sep 1 12:20:30 2014 -0700
----------------------------------------------------------------------
NEWS.txt | 3 +++
src/java/org/apache/cassandra/cql3/Cql.g | 8 ++++----
.../apache/cassandra/cql3/CreateTriggerStatementTest.java | 8 ++++++++
3 files changed, 15 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/873d0649/NEWS.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/873d0649/src/java/org/apache/cassandra/cql3/Cql.g
----------------------------------------------------------------------