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/80820109 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/80820109 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/80820109 Branch: refs/heads/cassandra-2.1 Commit: 80820109b8ad38b1be048666a1d9ef7672ff129c Parents: 26cd440 b4741d0 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Tue Aug 5 10:46:27 2014 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Tue Aug 5 10:46:27 2014 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java | 4 ---- 1 file changed, 4 deletions(-) ----------------------------------------------------------------------
