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/07228373 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/07228373 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/07228373 Branch: refs/heads/trunk Commit: 072283739b49219641df9e7234e796c90f072b6e Parents: eea5c37 6be62c2 Author: Brandon Williams <[email protected]> Authored: Wed May 14 17:36:58 2014 -0500 Committer: Brandon Williams <[email protected]> Committed: Wed May 14 17:36:58 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/hadoop/cql3/CqlConfigHelper.java | 32 ++++++++++++++++++-- 2 files changed, 30 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/07228373/CHANGES.txt ----------------------------------------------------------------------
