Merge branch 'cassandra-3.0' into cassandra-3.5
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/acc2f89c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/acc2f89c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/acc2f89c Branch: refs/heads/trunk Commit: acc2f89c10a7ae34c915c2c418f9dea5d8677c3c Parents: 5c4d5c7 70eab63 Author: Robert Stupp <sn...@snazy.de> Authored: Mon Mar 28 13:26:19 2016 +0200 Committer: Robert Stupp <sn...@snazy.de> Committed: Mon Mar 28 13:26:19 2016 +0200 ---------------------------------------------------------------------- src/java/org/apache/cassandra/service/paxos/PrepareCallback.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------
