Merge branch 'cassandra-3.9' into trunk * cassandra-3.9: Lost counter writes in compact table and static columns
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9b44a30b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9b44a30b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9b44a30b Branch: refs/heads/trunk Commit: 9b44a30bbd1351ab2d21849c1f783d5aa8fb1f87 Parents: 5051c0f f0fd9ad Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Thu Jul 28 10:22:11 2016 +0200 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Thu Jul 28 10:22:11 2016 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/cql3/UpdateParameters.java | 17 +++++++++-------- .../apache/cassandra/db/CounterMutation.java | 3 ++- .../db/partitions/PartitionUpdate.java | 20 ++++++++++++-------- 4 files changed, 24 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9b44a30b/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9b44a30b/src/java/org/apache/cassandra/db/CounterMutation.java ----------------------------------------------------------------------
