Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/92b6d7a3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/92b6d7a3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/92b6d7a3 Branch: refs/heads/trunk Commit: 92b6d7a3900dbaf97a8ae7283aecd23aa1f2a25e Parents: faffbf2 5030d42 Author: Jonathan Ellis <jbel...@apache.org> Authored: Thu Mar 13 12:00:56 2014 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Thu Mar 13 12:00:56 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/92b6d7a3/CHANGES.txt ----------------------------------------------------------------------