You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@cassandra.apache.org by jm...@apache.org on 2014/08/11 23:37:27 UTC

[12/50] [abbrv] 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/25041771
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/25041771
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/25041771

Branch: refs/heads/cassandra-2.1
Commit: 25041771f74ad842aee66f79f0d3c09cdadb0872
Parents: 8625661 bd191f1
Author: Brandon Williams <br...@apache.org>
Authored: Tue Aug 5 14:22:20 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Tue Aug 5 14:22:20 2014 -0500

----------------------------------------------------------------------
 src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java | 5 +++++
 1 file changed, 5 insertions(+)
----------------------------------------------------------------------