Merge branch 'cassandra-3.3' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c164e51e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c164e51e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c164e51e Branch: refs/heads/trunk Commit: c164e51e77b6a2ad72dac30eef39ad4e819391c9 Parents: 940ae51 5669c69 Author: Carl Yeksigian <[email protected]> Authored: Wed Feb 3 09:44:17 2016 -0500 Committer: Carl Yeksigian <[email protected]> Committed: Wed Feb 3 09:44:17 2016 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/Mutation.java | 2 +- src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java | 2 +- src/java/org/apache/cassandra/service/paxos/PaxosState.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c164e51e/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java ----------------------------------------------------------------------
