Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7a46c97f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7a46c97f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7a46c97f Branch: refs/heads/trunk Commit: 7a46c97f8e3bf81e3c74f6ee896d0203e35117b3 Parents: 88a3900 fb9b3d5 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Tue Aug 20 16:48:47 2013 +0200 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Tue Aug 20 16:48:47 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/7a46c97f/CHANGES.txt ----------------------------------------------------------------------
