Merge branch 'cassandra-3.0' into trunk * cassandra-3.0: Avoid clock skew corrupting other nodes through paxos
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/484e1c47 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/484e1c47 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/484e1c47 Branch: refs/heads/trunk Commit: 484e1c47f63c5ae326b4b5dc5ed74c1a3cb7ff21 Parents: f147ca9 969f797 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Thu Jun 23 09:58:05 2016 +0200 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Thu Jun 23 09:58:05 2016 +0200 ---------------------------------------------------------------------- CHANGES.txt | 2 + .../apache/cassandra/service/ClientState.java | 56 +++++++++++++++++--- .../apache/cassandra/service/StorageProxy.java | 6 ++- .../org/apache/cassandra/utils/UUIDGen.java | 32 +++++++++++ 4 files changed, 88 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/484e1c47/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/484e1c47/src/java/org/apache/cassandra/service/ClientState.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/484e1c47/src/java/org/apache/cassandra/service/StorageProxy.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/484e1c47/src/java/org/apache/cassandra/utils/UUIDGen.java ----------------------------------------------------------------------
