Merge branch 'cassandra-3.11' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/95a52a8b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/95a52a8b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/95a52a8b Branch: refs/heads/trunk Commit: 95a52a8bfbabb4acb3518ee7f5e6d256110d7bf0 Parents: 42827e6 75a9320 Author: Marcus Eriksson <[email protected]> Authored: Wed Apr 11 14:55:10 2018 +0200 Committer: Marcus Eriksson <[email protected]> Committed: Wed Apr 11 14:55:10 2018 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 2 +- src/java/org/apache/cassandra/service/StorageService.java | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/95a52a8b/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/95a52a8b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/95a52a8b/src/java/org/apache/cassandra/service/StorageService.java ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
