Updated Branches: refs/heads/trunk 2efeaf3ec -> 8cb7bc4af
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/8cb7bc4a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8cb7bc4a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8cb7bc4a Branch: refs/heads/trunk Commit: 8cb7bc4af33b90c28f16ab0ce8f54cff326cfd18 Parents: 2efeaf3 d64dc2e Author: Sylvain Lebresne <[email protected]> Authored: Thu Jan 17 12:13:34 2013 +0100 Committer: Sylvain Lebresne <[email protected]> Committed: Thu Jan 17 12:13:34 2013 +0100 ---------------------------------------------------------------------- .../org/apache/cassandra/service/StorageProxy.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8cb7bc4a/src/java/org/apache/cassandra/service/StorageProxy.java ----------------------------------------------------------------------
