merge from 2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/aec423bc Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/aec423bc Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/aec423bc Branch: refs/heads/trunk Commit: aec423bce55561eca6671a2e3d2c7ae07f3c9cdd Parents: 223d0e7 6ee71dd Author: Jonathan Ellis <jbel...@apache.org> Authored: Mon Feb 9 09:27:38 2015 -0600 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Mon Feb 9 09:27:38 2015 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/aec423bc/CHANGES.txt ----------------------------------------------------------------------
