Updated Branches: refs/heads/cassandra-1.1 a05f6766e -> a2ca30e79 refs/heads/cassandra-1.2 38bfc6dca -> 3e7708289 refs/heads/cassandra-1.2.0 38bfc6dca -> 3e7708289 refs/heads/trunk 0353330ab -> bce1f2b8e
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/bce1f2b8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bce1f2b8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bce1f2b8 Branch: refs/heads/trunk Commit: bce1f2b8ed9c574d0323b9cdb8fa827244b11df6 Parents: 0353330 3e77082 Author: Jonathan Ellis <jbel...@apache.org> Authored: Mon Nov 12 15:59:43 2012 -0600 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Mon Nov 12 15:59:43 2012 -0600 ---------------------------------------------------------------------- CHANGES.txt | 2 + .../org/apache/cassandra/service/StorageProxy.java | 17 ++++++++++++++- 2 files changed, 18 insertions(+), 1 deletions(-) ----------------------------------------------------------------------
