Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/70eab633 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/70eab633 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/70eab633 Branch: refs/heads/trunk Commit: 70eab633f289eb1e4fbe47b3e17ff3203337f233 Parents: 3a244d2 cab3d5d Author: Robert Stupp <[email protected]> Authored: Mon Mar 28 13:25:56 2016 +0200 Committer: Robert Stupp <[email protected]> Committed: Mon Mar 28 13:25:56 2016 +0200 ---------------------------------------------------------------------- src/java/org/apache/cassandra/service/paxos/PrepareCallback.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/70eab633/src/java/org/apache/cassandra/service/paxos/PrepareCallback.java ----------------------------------------------------------------------
