Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7a435c37 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7a435c37 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7a435c37 Branch: refs/heads/trunk Commit: 7a435c376cad0a031a7a58b754bb648988cb565e Parents: f340362 1168ddf Author: Tyler Hobbs <tylerlho...@gmail.com> Authored: Thu Feb 4 12:35:36 2016 -0600 Committer: Tyler Hobbs <tylerlho...@gmail.com> Committed: Thu Feb 4 12:35:36 2016 -0600 ---------------------------------------------------------------------- CHANGES.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7a435c37/CHANGES.txt ----------------------------------------------------------------------