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/0680372d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0680372d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0680372d Branch: refs/heads/trunk Commit: 0680372d8d35db485a47602d9838c28baa1ced17 Parents: a583123 e394625 Author: Jonathan Ellis <jbel...@apache.org> Authored: Thu May 23 09:25:10 2013 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Thu May 23 09:25:10 2013 -0500 ---------------------------------------------------------------------- .../org/apache/cassandra/net/CallbackInfo.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0680372d/src/java/org/apache/cassandra/net/CallbackInfo.java ----------------------------------------------------------------------
