Merge branch 'cassandra-2.1.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/622ae508 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/622ae508 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/622ae508 Branch: refs/heads/trunk Commit: 622ae50854e6e8ef96582094735525e654a5b388 Parents: 3612b84 9f1e957 Author: Sylvain Lebresne <[email protected]> Authored: Tue Aug 5 15:47:49 2014 +0200 Committer: Sylvain Lebresne <[email protected]> Committed: Tue Aug 5 15:47:49 2014 +0200 ---------------------------------------------------------------------- src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java | 5 +++++ 1 file changed, 5 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/622ae508/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java ----------------------------------------------------------------------
