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/0fa5cba3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0fa5cba3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0fa5cba3 Branch: refs/heads/trunk Commit: 0fa5cba35b9c97ad34dedbbd89a933f5b9d156e9 Parents: 2e916f9 84daab5 Author: Tyler Hobbs <ty...@datastax.com> Authored: Tue Apr 8 12:26:09 2014 -0500 Committer: Tyler Hobbs <ty...@datastax.com> Committed: Tue Apr 8 12:26:09 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + build.xml | 2 ++ 2 files changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0fa5cba3/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0fa5cba3/build.xml ----------------------------------------------------------------------
