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/277ca64c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/277ca64c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/277ca64c Branch: refs/heads/cassandra-2.1 Commit: 277ca64c7e421e0bd77c4efb393d27a147d7c19d Parents: bf4c76e 622ae50 Author: Sylvain Lebresne <[email protected]> Authored: Tue Aug 5 15:48:02 2014 +0200 Committer: Sylvain Lebresne <[email protected]> Committed: Tue Aug 5 15:48:02 2014 +0200 ---------------------------------------------------------------------- src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java | 5 +++++ 1 file changed, 5 insertions(+) ----------------------------------------------------------------------
