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

Fix merge of branch-22.04 to branch-22.06 #5027

Merged
merged 5 commits into from
Mar 23, 2022
Merged

Conversation

jlowe
Copy link
Member

@jlowe jlowe commented Mar 23, 2022

Fixes the auto-merge failure from #5025. Merge was clean, this is likely the unused import failure which is also fixed here.

razajafri and others added 4 commits March 23, 2022 11:33
…ricks] (NVIDIA#4976)

* replace readFooter with open() and getFootter

Signed-off-by: Raza Jafri <rjafri@nvidia.com>

* add dependency for db failure

Signed-off-by: Raza Jafri <rjafri@nvidia.com>

* close the file

Signed-off-by: Raza Jafri <rjafri@nvidia.com>

* addressed review comments

Signed-off-by: Raza Jafri <rjafri@nvidia.com>

Co-authored-by: Raza Jafri <rjafri@nvidia.com>
Signed-off-by: Jason Lowe <jlowe@nvidia.com>
Signed-off-by: Alessandro Bellina <abellina@nvidia.com>
@jlowe jlowe added the build Related to CI / CD or cleanly building label Mar 23, 2022
@jlowe jlowe added this to the Mar 21 - Apr 1 milestone Mar 23, 2022
@jlowe jlowe self-assigned this Mar 23, 2022
@jlowe
Copy link
Member Author

jlowe commented Mar 23, 2022

build

@jlowe
Copy link
Member Author

jlowe commented Mar 23, 2022

build

@jlowe jlowe merged commit 384f0d5 into NVIDIA:branch-22.06 Mar 23, 2022
@jlowe jlowe deleted the fix-merge branch March 23, 2022 20:36
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.

4 participants