Updated Branches: refs/heads/cassandra-1.2 3e7708289 -> 660016658 refs/heads/cassandra-1.2.0 3e7708289 -> 660016658 refs/heads/trunk bce1f2b8e -> 805e5cdd5
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/805e5cdd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/805e5cdd Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/805e5cdd Branch: refs/heads/trunk Commit: 805e5cdd53d8cb5c43cd8b686f99b99299239879 Parents: bce1f2b 6600166 Author: Jonathan Ellis <[email protected]> Authored: Mon Nov 12 16:14:56 2012 -0600 Committer: Jonathan Ellis <[email protected]> Committed: Mon Nov 12 16:14:56 2012 -0600 ---------------------------------------------------------------------- .../org/apache/cassandra/service/StorageProxy.java | 18 ++++++++++----- 1 files changed, 12 insertions(+), 6 deletions(-) ----------------------------------------------------------------------
