Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

dvc: still pending 1.x updates (3) #2077

Merged
merged 19 commits into from
Jan 7, 2021
Merged

dvc: still pending 1.x updates (3) #2077

merged 19 commits into from
Jan 7, 2021

Conversation

jorgeorpinel
Copy link
Contributor

This PR is basically for solving conflicts vs. master after #2075 is merged. No more changes are being added.

pared and others added 19 commits December 18, 2020 13:27
@pared
params: document --targets option
e86eb11
@jorgeorpinel
cmd: fux config file paths
ca2cb30
@pared @jorgeorpinel
Update content/docs/command-reference/params/diff.md
42c61b5 
Co-authored-by: Jorge Orpinel <jorgeorpinel@users.noreply.github.com>
@jorgeorpinel
Merge commit 'b27b11fd41b7168936b1c11e12719f9fd689bdd1' into v1 (back…
fafcbb7 
…port #2008)
@jorgeorpinel
Merge branch 'cmd/config-path' into v1
035c087
@jorgeorpinel
Revert "Update the cmd entry of the dvc.yaml file to add cmd as list …
365b768 
…option (#1980)"

This reverts commit 23247d8.
@restyled-io @restyled-commits
Restyled by prettier (#2042)
2064cce 
Co-authored-by: Restyled.io <commits@restyled.io>
@jorgeorpinel
Merge remote-tracking branch 'origin/4446_params_targets' into v1
28f46ee
@jorgeorpinel
dvc.yaml: review examples
a969d02
@jorgeorpinel
cmd: review push and pull examples
e6858cc
@jorgeorpinel
cache: centralize concept explanation in tooltip
193e043
@jorgeorpinel
cmd: match metrics show usage block to actual cmd
3b0c7e7
@jorgeorpinel
cmd: add git-archive-like example to list
049204c 
per #1521
@jorgeorpinel
run: review -d usage and consistency t/o docs
667550a 
per #1700
@jorgeorpinel
dvc.yaml: mention that there can be more than one per project
f5978df 
per #1641
@jorgeorpinel
cmd: use diff names/scripts in run examples
4781b64 
per #2075 (review)
@jorgeorpinel
cmd: no need for --in/out in run cmd examples
785f884 
per #2075 (review)
@jorgeorpinel
concept: don't emphasize cache structure is flat
56376d4 
per #2075 (review)
@jorgeorpinel
Merge branch 'master' into 1.0-updates
8065a36
@jorgeorpinel jorgeorpinel mentioned this pull request Jan 6, 2021
Merged
5 tasks
@jorgeorpinel jorgeorpinel temporarily deployed to dvc-landing-1-0-updates-jt22pp January 7, 2021 00:20 Inactive
@jorgeorpinel jorgeorpinel temporarily deployed to dvc-landing-1-0-updates-jt22pp January 7, 2021 00:37 Inactive
@jorgeorpinel jorgeorpinel temporarily deployed to dvc-landing-1-0-updates-jt22pp January 7, 2021 00:42 Inactive
@jorgeorpinel jorgeorpinel marked this pull request as ready for review January 7, 2021 04:19
@jorgeorpinel
Copy link
Contributor Author

@shcheklein note that this has the exact same changes as #2074 and #2075 combined. Those were PRs into v1 (in case you didn't notice). This one would actually get deployed when merged. Thanks

p.s. don't worry, that's the only time ever we do this double review as there are no more pending 1.x updates to work in that way.

@shcheklein
Copy link
Member

Good to go, make sure that it has exactly same changes though :) I trust you on this.

@jorgeorpinel
Copy link
Contributor Author

I did double check vs the changes in those PRs while merging conflicts. Thanks 👍

@jorgeorpinel jorgeorpinel merged commit 275a3ec into master Jan 7, 2021
@skshetry skshetry deleted the 1.0-updates branch January 12, 2021 10:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@shcheklein shcheklein shcheklein approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@jorgeorpinel @shcheklein @pared