Merge branch 'cassandra-1.2.0' into cassandra-1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/40762aec Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/40762aec Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/40762aec Branch: refs/heads/trunk Commit: 40762aec09288fc13c317381d83b067d6294808e Parents: 6374383 1bb78b0 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Thu Dec 13 04:35:43 2012 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Thu Dec 13 04:35:43 2012 +0300 ---------------------------------------------------------------------- .../org/apache/cassandra/config/CFMetaData.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ----------------------------------------------------------------------
