Skip to content

Commit 8b1120d

Browse files
Merge pull request #6995 from onflow/vishal/cherrypicks_to_master
Merging v0.37 changes into master and marking v0.38.0 backward compatible.
2 parents 6bd6cab + 51d35cf commit 8b1120d

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

cmd/bootstrap/transit/cmd/pull.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ func pull(cmd *cobra.Command, args []string) {
9797
fullOutpath := filepath.Join(flagBootDir, "public-root-information", filepath.Base(file.Name))
9898
fmd5 := utils.CalcMd5(fullOutpath)
9999
// only skip files that have an MD5 hash
100-
if file.MD5 != nil && bytes.Equal(fmd5, file.MD5) {
100+
if len(file.MD5) > 0 && bytes.Equal(fmd5, file.MD5) {
101101
log.Info().Str("source", file.Name).Str("dest", fullOutpath).Msgf("skipping existing file from transit servers")
102102
return
103103
}

engine/common/version/version_control.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ var defaultCompatibilityOverrides = map[string]struct{}{
4242
"0.37.18": {},
4343
"0.37.22": {},
4444
"0.37.26": {},
45+
"0.38.0": {},
4546
}
4647

4748
// VersionControl manages the version control system for the node.

0 commit comments

Comments
 (0)