Updated Branches: refs/heads/cassandra-1.1 030d4718e -> 0a8e978e7 refs/heads/cassandra-1.1.0 f956569db -> 2b77ef61c refs/heads/trunk 7e3bb8644 -> b8231eb22
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/b8231eb2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b8231eb2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b8231eb2 Branch: refs/heads/trunk Commit: b8231eb22e7d7a5fb2175006cdf589ac299b6522 Parents: 7e3bb86 0a8e978 Author: Jonathan Ellis <[email protected]> Authored: Wed Apr 4 12:06:35 2012 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Wed Apr 4 12:06:35 2012 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + interface/cassandra.thrift | 4 ++-- .../org/apache/cassandra/thrift/Cassandra.java | 4 ++++ .../org/apache/cassandra/thrift/CfDef.java | 6 ++---- .../org/apache/cassandra/thrift/Constants.java | 2 +- .../org/apache/cassandra/config/CFMetaData.java | 3 ++- 6 files changed, 12 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b8231eb2/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b8231eb2/src/java/org/apache/cassandra/config/CFMetaData.java ----------------------------------------------------------------------
