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/a4d3da31 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a4d3da31 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a4d3da31 Branch: refs/heads/cassandra-2.1 Commit: a4d3da319ca493a8860d25db65914944b2be7ffa Parents: 8082010 fa8e515 Author: Sylvain Lebresne <[email protected]> Authored: Tue Aug 5 18:02:34 2014 +0200 Committer: Sylvain Lebresne <[email protected]> Committed: Tue Aug 5 18:02:34 2014 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/cql3/statements/Selection.java | 5 ++++- src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java | 5 +++++ 3 files changed, 10 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a4d3da31/CHANGES.txt ----------------------------------------------------------------------
