Merge branch 'cassandra-3.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/34be4d61 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/34be4d61 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/34be4d61 Branch: refs/heads/trunk Commit: 34be4d61c914a214f9d1f929c6859c233c679bf5 Parents: 084590c eb0f56d Author: Joshua McKenzie <jmcken...@apache.org> Authored: Fri Dec 4 13:40:47 2015 -0500 Committer: Joshua McKenzie <jmcken...@apache.org> Committed: Fri Dec 4 13:40:47 2015 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/service/AbstractReadExecutor.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) ----------------------------------------------------------------------
