Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/22d86eb2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/22d86eb2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/22d86eb2 Branch: refs/heads/trunk Commit: 22d86eb2d280093dde206809fb48ca8c0dc7f0e6 Parents: 66af6fe ba95a68 Author: Dave Brosius <dbros...@mebigfatguy.com> Authored: Fri Apr 18 19:51:47 2014 -0400 Committer: Dave Brosius <dbros...@mebigfatguy.com> Committed: Fri Apr 18 19:51:47 2014 -0400 ---------------------------------------------------------------------- CHANGES.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/22d86eb2/CHANGES.txt ----------------------------------------------------------------------
