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