Merge branch 'cassandra-2.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4129c0b0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4129c0b0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4129c0b0 Branch: refs/heads/trunk Commit: 4129c0b00b28121afb8b90450d6578dd710404be Parents: 3671082 75e85b9 Author: Sylvain Lebresne <[email protected]> Authored: Mon Jun 29 09:32:12 2015 +0200 Committer: Sylvain Lebresne <[email protected]> Committed: Mon Jun 29 09:32:12 2015 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cql3/statements/ModificationStatement.java | 4 +--- .../apache/cassandra/service/ClientState.java | 19 ++++++++++--------- .../apache/cassandra/service/StorageProxy.java | 19 +++++++------------ src/java/org/apache/cassandra/utils/UUIDGen.java | 7 +++++++ 5 files changed, 26 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4129c0b0/CHANGES.txt ----------------------------------------------------------------------
