Merge branch 'cassandra-1.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6b16c1a5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6b16c1a5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6b16c1a5 Branch: refs/heads/trunk Commit: 6b16c1a570c608ba1e1dd15a3213e42f21b58c96 Parents: 2e9f51d 60b3584 Author: Dave Brosius <[email protected]> Authored: Thu Jun 6 18:15:40 2013 -0400 Committer: Dave Brosius <[email protected]> Committed: Thu Jun 6 18:15:40 2013 -0400 ---------------------------------------------------------------------- .../cassandra/hadoop/cql3/CQLConfigHelper.java | 109 --------------- .../cassandra/hadoop/cql3/CqlConfigHelper.java | 109 +++++++++++++++ 2 files changed, 109 insertions(+), 109 deletions(-) ----------------------------------------------------------------------
