You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ma...@apache.org on 2016/01/05 10:38:06 UTC
[3/4] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.3
Merge branch 'cassandra-3.0' into cassandra-3.3
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/19f60754
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/19f60754
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/19f60754
Branch: refs/heads/trunk
Commit: 19f6075409563b7b161dcdfe9fffed4c4e7f5202
Parents: 1bc147c 025384c
Author: Marcus Eriksson <ma...@apache.org>
Authored: Tue Jan 5 10:35:45 2016 +0100
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Tue Jan 5 10:35:45 2016 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/cql3/Cql.g | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/19f60754/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/19f60754/src/java/org/apache/cassandra/cql3/Cql.g
----------------------------------------------------------------------