Skip to content

Commit

Permalink
Merge branch 'main' into sort-by-context-columns,
Browse files Browse the repository at this point in the history
and fix additional merge problems
bcolloran committed Sep 12, 2023
2 parents b9be1cf + 4f22baf commit 95d1c7f
Showing 103 changed files with 2,540 additions and 1,920 deletions.
2 changes: 2 additions & 0 deletions cli/cmd/upgrade/upgrade.go
Original file line number Diff line number Diff line change
@@ -45,6 +45,8 @@ func UpgradeCmd(cfg *config.Config) *cobra.Command {
args = append(args, "--nightly")
}
cmd := exec.Command("/bin/bash", args...)
cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr
return cmd.Run()
},
}
487 changes: 155 additions & 332 deletions proto/gen/rill/runtime/v1/catalog.pb.go

Large diffs are not rendered by default.

139 changes: 0 additions & 139 deletions proto/gen/rill/runtime/v1/catalog.pb.validate.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 95d1c7f

Please sign in to comment.