Updated Branches: refs/heads/cassandra-1.1 170e14ab9 -> 65b09c8c9 refs/heads/trunk d59be21e8 -> 97a1c789e
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/97a1c789 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/97a1c789 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/97a1c789 Branch: refs/heads/trunk Commit: 97a1c789ead586075cec2fc240b2ae3004f38071 Parents: d59be21 65b09c8 Author: Jonathan Ellis <[email protected]> Authored: Wed Jun 20 15:24:05 2012 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Wed Jun 20 15:24:05 2012 -0500 ---------------------------------------------------------------------- CHANGES.txt | 2 + .../org/apache/cassandra/config/CFMetaData.java | 19 ++++++++++---- 2 files changed, 15 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/97a1c789/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/97a1c789/src/java/org/apache/cassandra/config/CFMetaData.java ----------------------------------------------------------------------
