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/d8994896 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d8994896 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d8994896 Branch: refs/heads/trunk Commit: d8994896c5a6ccc81fc84e6d3cb5ba9cebc3189c Parents: 20026a8 fce444f Author: blerer <[email protected]> Authored: Mon Oct 12 21:44:28 2015 +0200 Committer: blerer <[email protected]> Committed: Mon Oct 12 21:44:45 2015 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + NEWS.txt | 6 +++--- .../cassandra/cql3/validation/operations/AggregationTest.java | 3 +++ 3 files changed, 7 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d8994896/CHANGES.txt ----------------------------------------------------------------------
