X-Git-Url: https://git.arvados.org/lightning.git/blobdiff_plain/00b2acd54dd1aa412f6f2bddc24b1bbb31c7ae3f..78476022f5636162b88673d525c3a02f4ed19f18:/merge.go

diff --git a/merge.go b/merge.go
index 6530d60027..68560edbd0 100644
--- a/merge.go
+++ b/merge.go
@@ -1,3 +1,7 @@
+// Copyright (C) The Lightning Authors. All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0
+
 package lightning
 
 import (
@@ -70,7 +74,7 @@ func (cmd *merger) RunCommand(prog string, args []string, stdin io.Reader, stdou
 			Name:        "lightning merge",
 			Client:      arvados.NewClientFromEnv(),
 			ProjectUUID: *projectUUID,
-			RAM:         250000000000,
+			RAM:         700000000000,
 			VCPUs:       16,
 			Priority:    *priority,
 			APIAccess:   true,
@@ -173,7 +177,7 @@ func (cmd *merger) doMerge() error {
 		go func(input string) {
 			defer wg.Done()
 			log.Printf("%s: reading", input)
-			err := cmd.tilelib.LoadGob(ctx, rdr, strings.HasSuffix(input, ".gz"), nil)
+			err := cmd.tilelib.LoadGob(ctx, rdr, strings.HasSuffix(input, ".gz"))
 			if err != nil {
 				cmd.setError(fmt.Errorf("%s: load failed: %w", input, err))
 				cancel()