Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6d43fc98 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6d43fc98 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6d43fc98 Branch: refs/heads/trunk Commit: 6d43fc981299eb3eabc781af8572bdfc9f3cb37e Parents: cb1a634 4238cdd Author: Aleksey Yeschenko <[email protected]> Authored: Mon Apr 11 20:07:50 2016 +0100 Committer: Aleksey Yeschenko <[email protected]> Committed: Mon Apr 11 20:07:50 2016 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/hadoop/cql3/CqlConfigHelper.java | 58 +++++++++++++------- 2 files changed, 40 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6d43fc98/CHANGES.txt ----------------------------------------------------------------------
