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/407dc30e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/407dc30e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/407dc30e Branch: refs/heads/cassandra-3.0 Commit: 407dc30e277e99644805b6a93f432bd5e80fbd3d Parents: fe3f3da 23d4822 Author: Tyler Hobbs <tylerlho...@gmail.com> Authored: Wed Aug 24 16:52:27 2016 -0500 Committer: Tyler Hobbs <tylerlho...@gmail.com> Committed: Wed Aug 24 16:52:27 2016 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/service/paxos/ProposeCallback.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------