Updated Branches: refs/heads/trunk 65bd017fc -> 32ad73bcd
Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/32ad73bc Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/32ad73bc Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/32ad73bc Branch: refs/heads/trunk Commit: 32ad73bcd4063151eb741b05f759b07f0fb87877 Parents: 65bd017 40762ae Author: Aleksey Yeschenko <alek...@apache.org> Authored: Thu Dec 13 04:36:23 2012 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Thu Dec 13 04:36:23 2012 +0300 ---------------------------------------------------------------------- .../org/apache/cassandra/config/CFMetaData.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/32ad73bc/src/java/org/apache/cassandra/config/CFMetaData.java ----------------------------------------------------------------------
