Merge branch 'cassandra-2.0.0' 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/fb9b3d57 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fb9b3d57 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fb9b3d57 Branch: refs/heads/cassandra-2.0 Commit: fb9b3d57dc7a664a96b75f5a0ddc29497b3bbe98 Parents: 83feb94 3a7d9f8 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Tue Aug 20 16:48:16 2013 +0200 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Tue Aug 20 16:48:16 2013 +0200 ---------------------------------------------------------------------- CHANGES.txt | 11 +++++++++++ src/java/org/apache/cassandra/db/DefsTables.java | 3 +-- 2 files changed, 12 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/fb9b3d57/CHANGES.txt ----------------------------------------------------------------------