merge
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b4cd7b58 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b4cd7b58 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b4cd7b58 Branch: refs/heads/trunk Commit: b4cd7b58e73261891649fbb30e5cc83989afc9ce Parents: 43ad56b f97a981 Author: Jonathan Ellis <[email protected]> Authored: Thu Feb 6 10:20:24 2014 -0600 Committer: Jonathan Ellis <[email protected]> Committed: Thu Feb 6 10:20:24 2014 -0600 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b4cd7b58/CHANGES.txt ----------------------------------------------------------------------
