Updated Branches: refs/heads/cassandra-1.1 b961986a7 -> 05a5ede91 refs/heads/trunk 5c1612017 -> 7dee84c34
Merge branch 'cassandra-1.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7dee84c3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7dee84c3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7dee84c3 Branch: refs/heads/trunk Commit: 7dee84c34e98e4c6cc5b8d14dbe1247245679653 Parents: 5c16120 05a5ede Author: Jonathan Ellis <jbel...@apache.org> Authored: Tue Sep 25 16:50:36 2012 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Tue Sep 25 16:50:36 2012 -0500 ---------------------------------------------------------------------- .../org/apache/cassandra/config/CFMetaData.java | 4 ++-- .../org/apache/cassandra/config/KSMetaData.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7dee84c3/src/java/org/apache/cassandra/config/CFMetaData.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7dee84c3/src/java/org/apache/cassandra/config/KSMetaData.java ----------------------------------------------------------------------
