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

Dedup from_entity_ids when merging two entities #10101

Merged
merged 1 commit into from Oct 12, 2021
Merged

Dedup from_entity_ids when merging two entities #10101

merged 1 commit into from Oct 12, 2021

Conversation

mdgreenfield
Copy link
Contributor

Fixes #10100

@mdgreenfield mdgreenfield mentioned this pull request Sep 28, 2021
Merged
@vercel vercel bot temporarily deployed to Preview – vault-storybook October 1, 2021 15:21 Inactive
@vercel vercel bot temporarily deployed to Preview – vault October 1, 2021 15:21 Inactive
@mdgreenfield
Copy link
Contributor Author

@vishalnayak I've rebased the PR and added the changelog entry.

Regarding the build failures:

  • ci/circleci: build-common-layers looks like maybe a transient error with a buster apt repo
  • ci/circleci: test-go-remote-docker CircleCI has indicated that those are flakey tests are they are also related to the Cassandra database plugin so I don't think they are related to my change.

Do you want to try re-running the jobs? I lack the perms to retry jobs AFAIK.

@mdgreenfield
Copy link
Contributor Author

These errors also look like the same errors on recent main builds.

@hghaf099 hghaf099 merged commit c0d8df9 into hashicorp:main Oct 12, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vishalnayak vishalnayak vishalnayak 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.

Merging of entities should sanitize from_entity_id input
3 participants
@mdgreenfield @vishalnayak @hghaf099