You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by bl...@apache.org on 2021/05/17 08:46:19 UTC
[cassandra] branch trunk updated (9d57d21 -> 8a507d0)
This is an automated email from the ASF dual-hosted git repository.
blerer pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git.
from 9d57d21 Merge branch 'cassandra-4.0' into trunk
add d35f36c Fix misplacement of originatingHostId in stats metadata
new 8a507d0 Merge branch cassandra-4.0 into trunk
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../io/sstable/metadata/StatsMetadata.java | 44 +++++++++++----------
.../legacy_nb_clust/nb-1-big-CompressionInfo.db | Bin 207 -> 207 bytes
.../legacy_tables/legacy_nb_clust/nb-1-big-Data.db | Bin 8739 -> 8749 bytes
.../legacy_nb_clust/nb-1-big-Digest.crc32 | 2 +-
.../legacy_nb_clust/nb-1-big-Index.db | Bin 157553 -> 157553 bytes
.../legacy_nb_clust/nb-1-big-Statistics.db | Bin 7177 -> 7177 bytes
.../legacy_tables/legacy_nb_clust/nb-1-big-TOC.txt | 10 ++---
.../nb-1-big-CompressionInfo.db | Bin 199 -> 199 bytes
.../legacy_nb_clust_counter/nb-1-big-Data.db | Bin 7779 -> 7716 bytes
.../legacy_nb_clust_counter/nb-1-big-Digest.crc32 | 2 +-
.../legacy_nb_clust_counter/nb-1-big-Index.db | Bin 157553 -> 157553 bytes
.../legacy_nb_clust_counter/nb-1-big-Statistics.db | Bin 7186 -> 7186 bytes
.../legacy_nb_clust_counter/nb-1-big-TOC.txt | 10 ++---
.../legacy_nb_simple/nb-1-big-Data.db | Bin 89 -> 89 bytes
.../legacy_nb_simple/nb-1-big-Digest.crc32 | 2 +-
.../legacy_nb_simple/nb-1-big-Statistics.db | Bin 4730 -> 4730 bytes
.../legacy_nb_simple/nb-1-big-TOC.txt | 10 ++---
.../legacy_nb_simple_counter/nb-1-big-Data.db | Bin 141 -> 140 bytes
.../legacy_nb_simple_counter/nb-1-big-Digest.crc32 | 2 +-
.../nb-1-big-Statistics.db | Bin 4739 -> 4739 bytes
.../legacy_nb_simple_counter/nb-1-big-TOC.txt | 10 ++---
21 files changed, 47 insertions(+), 45 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[cassandra] 01/01: Merge branch cassandra-4.0 into trunk
Posted by bl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
blerer pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 8a507d04b41762da723092a1f2a37bdc6f53c632
Merge: 9d57d21 d35f36c
Author: Benjamin Lerer <b....@gmail.com>
AuthorDate: Mon May 17 10:40:09 2021 +0200
Merge branch cassandra-4.0 into trunk
.../io/sstable/metadata/StatsMetadata.java | 44 +++++++++++----------
.../legacy_nb_clust/nb-1-big-CompressionInfo.db | Bin 207 -> 207 bytes
.../legacy_tables/legacy_nb_clust/nb-1-big-Data.db | Bin 8739 -> 8749 bytes
.../legacy_nb_clust/nb-1-big-Digest.crc32 | 2 +-
.../legacy_nb_clust/nb-1-big-Index.db | Bin 157553 -> 157553 bytes
.../legacy_nb_clust/nb-1-big-Statistics.db | Bin 7177 -> 7177 bytes
.../legacy_tables/legacy_nb_clust/nb-1-big-TOC.txt | 10 ++---
.../nb-1-big-CompressionInfo.db | Bin 199 -> 199 bytes
.../legacy_nb_clust_counter/nb-1-big-Data.db | Bin 7779 -> 7716 bytes
.../legacy_nb_clust_counter/nb-1-big-Digest.crc32 | 2 +-
.../legacy_nb_clust_counter/nb-1-big-Index.db | Bin 157553 -> 157553 bytes
.../legacy_nb_clust_counter/nb-1-big-Statistics.db | Bin 7186 -> 7186 bytes
.../legacy_nb_clust_counter/nb-1-big-TOC.txt | 10 ++---
.../legacy_nb_simple/nb-1-big-Data.db | Bin 89 -> 89 bytes
.../legacy_nb_simple/nb-1-big-Digest.crc32 | 2 +-
.../legacy_nb_simple/nb-1-big-Statistics.db | Bin 4730 -> 4730 bytes
.../legacy_nb_simple/nb-1-big-TOC.txt | 10 ++---
.../legacy_nb_simple_counter/nb-1-big-Data.db | Bin 141 -> 140 bytes
.../legacy_nb_simple_counter/nb-1-big-Digest.crc32 | 2 +-
.../nb-1-big-Statistics.db | Bin 4739 -> 4739 bytes
.../legacy_nb_simple_counter/nb-1-big-TOC.txt | 10 ++---
21 files changed, 47 insertions(+), 45 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org