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

Fix auto merge conflict 5850 #5853

Merged
merged 3 commits into from
Jun 16, 2022
Merged

Fix auto merge conflict 5850 #5853

merged 3 commits into from
Jun 16, 2022

Commits on Jun 16, 2022

  1. Update spark330shim to use released lib (NVIDIA#5848) 

    * Revert "Temporarily allow 3.3.1 for 3.3.0 shims. (NVIDIA#5693)"

This reverts commit 53cfa49.

* update shim330 dep to released spark 330 libs

Signed-off-by: Peixin Li <pxli@nyu.edu>

* drop 330 from snapshot section in buildall
    @pxLi
    pxLi authored Jun 16, 2022
    Configuration menu
    Copy the full SHA
    d1f601a View commit details
    Browse the repository at this point in the history

  2. Update 22.06 to include new commits (NVIDIA#5851) 

    Signed-off-by: Peixin Li <pxli@nyu.edu>
    @pxLi
    pxLi authored Jun 16, 2022
    Configuration menu
    Copy the full SHA
    2c4a9e7 View commit details
    Browse the repository at this point in the history

  3. Merge branch-22.06 into branch-22.08

    @pxLi
    pxLi committed Jun 16, 2022
    Configuration menu
    Copy the full SHA
    c481d3a View commit details
    Browse the repository at this point in the history