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/26cd4408 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/26cd4408 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/26cd4408 Branch: refs/heads/trunk Commit: 26cd4408f3c0c527d3033262e9984724bdd2ce8b Parents: efe57f2 9faf905 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Tue Aug 5 10:35:37 2014 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Tue Aug 5 10:35:37 2014 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java | 1 - 1 file changed, 1 deletion(-) ----------------------------------------------------------------------