Updated Branches: refs/heads/cassandra-1.2 0f7521526 -> dc682de2e refs/heads/cassandra-1.2.0 40e22489c -> 215813157 refs/heads/trunk 19b96b5da -> 47e6f3799
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/47e6f379 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/47e6f379 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/47e6f379 Branch: refs/heads/trunk Commit: 47e6f37994a3c43028cec5a8907f10144550d2b3 Parents: 19b96b5 dc682de Author: Jonathan Ellis <jbel...@apache.org> Authored: Tue Dec 4 23:18:18 2012 -0600 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Tue Dec 4 23:18:18 2012 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/config/CFMetaData.java | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/47e6f379/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/47e6f379/src/java/org/apache/cassandra/config/CFMetaData.java ----------------------------------------------------------------------
