Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5d385599 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5d385599 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5d385599 Branch: refs/heads/trunk Commit: 5d38559908cfd8b5ecbad03a1cedb355d7856cee Parents: b06e703 40f4daa Author: Benedict Elliott Smith <[email protected]> Authored: Wed Sep 30 19:57:02 2015 +0100 Committer: Benedict Elliott Smith <[email protected]> Committed: Wed Sep 30 19:57:02 2015 +0100 ---------------------------------------------------------------------- .../apache/cassandra/net/WriteCallbackInfo.java | 36 +++++---- test/unit/org/apache/cassandra/MockSchema.java | 2 +- .../cassandra/net/WriteCallbackInfoTest.java | 79 ++++++++++++++++++++ 3 files changed, 102 insertions(+), 15 deletions(-) ----------------------------------------------------------------------
