You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by bl...@apache.org on 2015/09/16 10:37:48 UTC
[4/6] cassandra git commit: Merge branch cassandra-2.1 into
cassandra-2.2
Merge branch cassandra-2.1 into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e7c2952d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e7c2952d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e7c2952d
Branch: refs/heads/trunk
Commit: e7c2952d31e8b6ddfef220942ba83888806beabb
Parents: 8cad732 b8b4eb7
Author: blerer <be...@datastax.com>
Authored: Wed Sep 16 10:21:44 2015 +0200
Committer: blerer <be...@datastax.com>
Committed: Wed Sep 16 10:21:58 2015 +0200
----------------------------------------------------------------------
build.xml | 1 +
doc/cql3/CQL.textile | 20 ++++++++++++++------
2 files changed, 15 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e7c2952d/build.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e7c2952d/doc/cql3/CQL.textile
----------------------------------------------------------------------