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:50 UTC
[6/6] cassandra git commit: Merge branch cassandra-3.0 into trunk
Merge branch cassandra-3.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/61ce1b9a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/61ce1b9a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/61ce1b9a
Branch: refs/heads/trunk
Commit: 61ce1b9a71c30b7c394253894a333e94653f13eb
Parents: 1ecb7a4 0d4e0cd
Author: blerer <be...@datastax.com>
Authored: Wed Sep 16 10:35:32 2015 +0200
Committer: blerer <be...@datastax.com>
Committed: Wed Sep 16 10:37:06 2015 +0200
----------------------------------------------------------------------
build.xml | 1 +
doc/cql3/CQL.textile | 20 ++++++++++++-----
.../cassandra/hadoop/cql3/CqlInputFormat.java | 23 +++++++++++++++-----
3 files changed, 32 insertions(+), 12 deletions(-)
----------------------------------------------------------------------