Skip to content
New issue

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

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

Already on GitHub? # to your account

DAOS-7208 control: Update all vendored dependencies #5397

Merged
merged 2 commits into from
Apr 28, 2021
Merged

Conversation

mjmac
Copy link
Contributor

@mjmac mjmac commented Apr 9, 2021

  • switch raft-boltdb to upstream v2
  • update raft to v1.2.0
  • update grpc to v1.37.0
  • update protobuf to v1.26.0
  • update yaml to v2.3.0

@daosbuild1
Copy link
Collaborator

@daosbuild1
Copy link
Collaborator

@daosbuild1
Copy link
Collaborator

Test stage Test CentOS 7 RPMs completed with status FAILURE. https://build.hpdd.intel.com/job/daos-stack/job/daos/job/PR-5397/3/display/redirect

@mjmac mjmac force-pushed the mjmac/DAOS-7208 branch from 5064d49 to 9e61df8 Compare April 14, 2021 12:44
@daosbuild1
Copy link
Collaborator

@mjmac mjmac self-assigned this Apr 15, 2021
@mjmac mjmac requested review from kjacque, dpquigl and tanabarr April 15, 2021 14:55
@mjmac
Copy link
Contributor Author

mjmac commented Apr 15, 2021

Checkpatch failure is in vendored code. I thought that we had disabled scanning that stuff but I guess not...

Copy link
Contributor

@kjacque kjacque left a comment

Choose a reason for hiding this comment

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

Nice work sorting all this out.

kjacque
kjacque previously approved these changes Apr 15, 2021
tanabarr
tanabarr previously approved these changes Apr 16, 2021

"github.com/daos-stack/daos/src/control/common"
)

func TestMarshal_Failed(t *testing.T) {
Copy link
Contributor

Choose a reason for hiding this comment

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

why was this removed?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Doesn't fail anymore. Calling proto.Marshal(nil) just returns nil with no error.

@daosbuild1
Copy link
Collaborator

@daosbuild1
Copy link
Collaborator

Test stage NLT completed with status FAILURE. https://build.hpdd.intel.com/job/daos-stack/job/daos/job/PR-5397/6/display/redirect

dpquigl
dpquigl previously approved these changes Apr 19, 2021
@daosbuild1
Copy link
Collaborator

  - switch raft-boltdb to upstream v2
  - update raft to v1.2.0
  - update grpc to v1.37.0
  - update protobuf to v1.26.0
  - update yaml to v2.3.0

Signed-off-by: Michael MacDonald <mjmac.macdonald@intel.com>
@mjmac mjmac dismissed stale reviews from dpquigl, tanabarr, and kjacque via e439840 April 23, 2021 16:36
@mjmac mjmac force-pushed the mjmac/DAOS-7208 branch from 49b0e3f to e439840 Compare April 23, 2021 16:36
@mjmac
Copy link
Contributor Author

mjmac commented Apr 23, 2021

Sorry, had to force-push as merge wasn't playing well with the large change. No updates aside from resolving conflicts with latest master. Will try to get this landed early next week so that it doesn't drag on and run into more conflicts.

@daosbuild1
Copy link
Collaborator

kjacque
kjacque previously approved these changes Apr 23, 2021
@daosbuild1
Copy link
Collaborator

@dpquigl dpquigl self-requested a review April 27, 2021 19:54
@mjmac mjmac merged commit b90f73d into master Apr 28, 2021
@mjmac mjmac deleted the mjmac/DAOS-7208 branch April 28, 2021 15:04
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

5 participants