Merge branch 'cassandra-3.0' into cassandra-3.3
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/233e785b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/233e785b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/233e785b Branch: refs/heads/trunk Commit: 233e785bdf1a0b75d36e3fec4ed10256f12eca04 Parents: d7bea00 c4d83f1 Author: Carl Yeksigian <c...@apache.org> Authored: Wed Feb 3 08:34:14 2016 -0500 Committer: Carl Yeksigian <c...@apache.org> Committed: Wed Feb 3 08:34:14 2016 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/Mutation.java | 27 ++++++++++++--------- 1 file changed, 16 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/233e785b/src/java/org/apache/cassandra/db/Mutation.java ----------------------------------------------------------------------
