Skip to content

Consolidation/vacuum should use ctx if config null - #2126

Merged
Shelnutt2 merged 1 commit into
devfrom
sethshelnutt/ch5806/c-api-consolidate-doesn-t-use-ctx-config
Mar 12, 2021
Merged

Shelnutt2 merged 1 commit into
devfrom
sethshelnutt/ch5806/c-api-consolidate-doesn-t-use-ctx-config

Conversation

@Shelnutt2

Copy link
Copy Markdown
Contributor

If the user only passes a ctx and not a config we should use the config from the ctx object for the consolidation and vacuum functions.

TYPE: BUG

DESC: Consolidate and vacuum will now correctly use the ctx's config if no config is passed directly.

@shortcut-integration

Copy link
Copy Markdown

This pull request has been linked to Clubhouse Story #5806: c-api consolidate doesn't use ctx config.

@Shelnutt2
Shelnutt2 force-pushed the sethshelnutt/ch5806/c-api-consolidate-doesn-t-use-ctx-config branch from f197ced to 808e047 Compare March 12, 2021 15:55
If the user only passes a ctx and not a config we should use the config
from the ctx object for the consolidation and vacuum functions.
@Shelnutt2
Shelnutt2 force-pushed the sethshelnutt/ch5806/c-api-consolidate-doesn-t-use-ctx-config branch from 808e047 to 13a7ab6 Compare March 12, 2021 17:55
@Shelnutt2
Shelnutt2 merged commit 880c7a0 into dev Mar 12, 2021
@Shelnutt2
Shelnutt2 deleted the sethshelnutt/ch5806/c-api-consolidate-doesn-t-use-ctx-config branch March 12, 2021 22:38
@github-actions

Copy link
Copy Markdown
Contributor

The backport to release-2.2 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-release-2.2 release-2.2
# Navigate to the new working tree
cd .worktrees/backport-release-2.2
# Create a new branch
git switch --create backport-2126-to-release-2.2
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick ---mainline 1 880c7a0bef1d986a05764b4450c301c1e54d293d
# Push it to GitHub
git push --set-upstream origin backport-2126-to-release-2.2
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release-2.2

Then, create a pull request where the base branch is release-2.2 and the compare/head branch is backport-2126-to-release-2.2.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants