Updated Branches: refs/heads/cassandra-1.1 d992a93c2 -> 991c2a25b refs/heads/cassandra-1.1.0 df7776b5e -> 43a472e13 refs/heads/trunk 65d51bb74 -> 9b6156ba7
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/9b6156ba Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9b6156ba Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9b6156ba Branch: refs/heads/trunk Commit: 9b6156ba788ea58804d3b566e9676c82bf2fbd69 Parents: 65d51bb 991c2a2 Author: Jonathan Ellis <jbel...@apache.org> Authored: Wed Apr 18 18:14:07 2012 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Wed Apr 18 18:14:07 2012 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/Memtable.java | 12 +++++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9b6156ba/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9b6156ba/src/java/org/apache/cassandra/db/Memtable.java ----------------------------------------------------------------------
