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

Move the declaration to a OSS build tag file to not have it collide w… #10750

Merged
merged 3 commits into from
Jan 25, 2021

Conversation

vishalnayak
Copy link
Member

…ith ent declarations

@vercel
Copy link

vercel bot commented Jan 23, 2021

This pull request is being automatically deployed with Vercel (learn more).
To see the status of your deployments, click below or on the icon next to each commit.

vault-storybook – ./ui

🔍 Inspect: https://vercel.com/hashicorp/vault-storybook/gzp8zi2ys
✅ Preview: Canceled

[Deployment for e6c46b3 canceled]

@vishalnayak vishalnayak added this to the 1.6.2 milestone Jan 23, 2021
@vercel vercel bot temporarily deployed to Preview – vault January 24, 2021 15:22 Inactive
@vercel vercel bot temporarily deployed to Preview – vault-storybook January 24, 2021 15:22 Inactive
@vercel vercel bot temporarily deployed to Preview – vault-storybook January 24, 2021 15:22 Inactive
@vercel vercel bot temporarily deployed to Preview – vault January 24, 2021 15:22 Inactive
@vishalnayak vishalnayak merged commit a8519a8 into master Jan 25, 2021
@vishalnayak vishalnayak deleted the move-declaration branch January 25, 2021 14:35
HridoyRoy pushed a commit that referenced this pull request Jan 25, 2021
* feat(agent): add retry configuration for vault agent

* feat(agent): add test fixtures for retry

* fix(retry): move retry stanza to top level as template_retry

* fix(retry): add retry config to ServerConfig struct

* fix(retry): point config parser to parse template_retry instead of retry

* remove netlify config (#10711)

* Fix build (#10749)

* Move the declaration to a OSS build tag file to not have it collide w… (#10750)

* Move the declaration to a OSS build tag file to not have it collide with ent declarations

* Add comment

* Remove comment to trigger ci

* Unconditionally use the root namespace when calling sys/seal-status. (#10742)

* feat(agent): add retry configuration for vault agent

* feat(agent): add test fixtures for retry

* fix(retry): move retry stanza to top level as template_retry

* fix(retry): add retry config to ServerConfig struct

* fix(retry): point config parser to parse template_retry instead of retry

Co-authored-by: Hridoy Roy <roy@hashicorp.com>
Co-authored-by: Jeff Escalante <jescalan@users.noreply.github.com>
Co-authored-by: Vishal Nayak <vishalnayak@users.noreply.github.com>
Co-authored-by: Mark Gritter <mgritter@hashicorp.com>
vishalnayak added a commit that referenced this pull request Jan 26, 2021
#10750)

* Move the declaration to a OSS build tag file to not have it collide with ent declarations

* Add comment

* Remove comment to trigger ci
vishalnayak added a commit that referenced this pull request Jan 26, 2021
* Add list peers to DR secondaries (#10746)

* Fix build (#10749)

* Move the declaration to a OSS build tag file to not have it collide w… (#10750)

* Move the declaration to a OSS build tag file to not have it collide with ent declarations

* Add comment

* Remove comment to trigger ci
vishalnayak added a commit that referenced this pull request Jan 26, 2021
* Add list peers to DR secondaries (#10746)

* Fix build (#10749)

* Move the declaration to a OSS build tag file to not have it collide w… (#10750)

* Move the declaration to a OSS build tag file to not have it collide with ent declarations

* Add comment

* Remove comment to trigger ci

* Fix remove peers check (#10758)
vishalnayak added a commit that referenced this pull request Jan 26, 2021
…10783)

* Add list peers to DR secondaries (#10746)

* Fix build (#10749)

* Move the declaration to a OSS build tag file to not have it collide w… (#10750)

* Move the declaration to a OSS build tag file to not have it collide with ent declarations

* Add comment

* Remove comment to trigger ci

* Fix remove peers check (#10758)

* Remove peer DR op token check only on secondaries (#10765)
vishalnayak added a commit that referenced this pull request Jan 26, 2021
* Add list peers to DR secondaries (#10746)

* Fix build (#10749)

* Move the declaration to a OSS build tag file to not have it collide w… (#10750)

* Move the declaration to a OSS build tag file to not have it collide with ent declarations

* Add comment

* Remove comment to trigger ci

* Fix remove peers check (#10758)

* Remove peer DR op token check only on secondaries (#10765)

* Set namespace for template server in agent (#10757)

* Set namespace for template server in agent

* cl++
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants