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.

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

Merge branch-21.08 to branch-21.10 #3000

Merged
merged 3 commits into from
Jul 23, 2021
Merged

Conversation

jlowe
Copy link
Member

@jlowe jlowe commented Jul 22, 2021

This resolves the merge problem identified in #2998 which apparently hiccuped due to a race with code being committed at the same time. The merge was clean.

NOTE: This must be committed with a merge commit, not squashed!

mythrocks and others added 3 commits July 22, 2021 11:30
This commit removes commented tests from WindowFunctionSuite.
The null-`ORDER BY` column cases are already tested as part of
`window_function_test.py`.

Signed-off-by: Mithun RK <mythrocks@gmail.com>
…iling-tools.md with some modification (NVIDIA#2985)

* Signed-off-by: Hao Zhu <hazhu@nvidia.com>

Move tools README under docs folder.

* Signed-off-by: Hao Zhu <hazhu@nvidia.com>

Correct some typos of the link

* Signed-off-by: Hao Zhu <hazhu@nvidia.com>

Fix some typo

* Signed-off-by: Hao Zhu <hazhu@nvidia.com>

Add more example options for tools doc

* Signed-off-by: Hao Zhu <hazhu@nvidia.com>

Add a new README for tools.

* Update docs/additional-functionality/qualification-profiling-tools.md

Co-authored-by: Jason Lowe <jlowe@nvidia.com>

* Update docs/additional-functionality/qualification-profiling-tools.md

Co-authored-by: Jason Lowe <jlowe@nvidia.com>

* Update docs/additional-functionality/qualification-profiling-tools.md

Co-authored-by: Jason Lowe <jlowe@nvidia.com>

* Update docs/additional-functionality/qualification-profiling-tools.md

Co-authored-by: Jason Lowe <jlowe@nvidia.com>

* Update docs/additional-functionality/qualification-profiling-tools.md

Co-authored-by: Jason Lowe <jlowe@nvidia.com>

* Update docs/additional-functionality/qualification-profiling-tools.md

Co-authored-by: Jason Lowe <jlowe@nvidia.com>

* Update docs/additional-functionality/qualification-profiling-tools.md

Co-authored-by: Jason Lowe <jlowe@nvidia.com>

* Update docs/additional-functionality/qualification-profiling-tools.md

Co-authored-by: Jason Lowe <jlowe@nvidia.com>

* Update docs/additional-functionality/qualification-profiling-tools.md

Co-authored-by: Jason Lowe <jlowe@nvidia.com>

* Update docs/additional-functionality/qualification-profiling-tools.md

Co-authored-by: Jason Lowe <jlowe@nvidia.com>

* Update tools/README.md

Co-authored-by: Jason Lowe <jlowe@nvidia.com>

* Update docs/additional-functionality/qualification-profiling-tools.md

Co-authored-by: Jason Lowe <jlowe@nvidia.com>

* Update docs/additional-functionality/qualification-profiling-tools.md

Co-authored-by: Jason Lowe <jlowe@nvidia.com>

* Update docs/additional-functionality/qualification-profiling-tools.md

Co-authored-by: Jason Lowe <jlowe@nvidia.com>

* Update docs/additional-functionality/qualification-profiling-tools.md

Co-authored-by: Jason Lowe <jlowe@nvidia.com>

* Remove some lines.

Co-authored-by: Jason Lowe <jlowe@nvidia.com>
@jlowe jlowe added the build Related to CI / CD or cleanly building label Jul 22, 2021
@jlowe jlowe self-assigned this Jul 22, 2021
@mythrocks
Copy link
Collaborator

Thanks for fixing this, @jlowe. @abellina alerted me to this merge failure earlier this morning.

Copy link
Collaborator

@pxLi pxLi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Going to merge w/ a merge commit

@pxLi pxLi merged commit 35ebfad into NVIDIA:branch-21.10 Jul 23, 2021
@jlowe jlowe deleted the fix-merge branch September 10, 2021 15:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
build Related to CI / CD or cleanly building
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants