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/cc3bd8bc Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cc3bd8bc Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cc3bd8bc Branch: refs/heads/trunk Commit: cc3bd8bc98b9ee42976fbd3cc9e8fba5aacc8417 Parents: 2809b06 e6602f7 Author: Sylvain Lebresne <[email protected]> Authored: Tue Aug 5 10:22:32 2014 +0200 Committer: Sylvain Lebresne <[email protected]> Committed: Tue Aug 5 10:22:32 2014 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + build.xml | 2 +- .../org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java | 8 ++++---- 3 files changed, 6 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/cc3bd8bc/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/cc3bd8bc/build.xml ----------------------------------------------------------------------
