Merge latest changes to master #1
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Policy Feedback from PM
* Fix intermittent panic by storing a reference to the grpc server and using that to ensure it will never be nil. * Just get rid of c.rpcServer
* auth/aws: Fix error with empty bound_iam_principal_arn In cases where there doesn't need to be a bound_iam_principal_arn, i.e., either auth_type is ec2 or there are other bindings with the iam auth_type, but it is specified explicitly anyway, Vault tried to parse it to resolve to internal unique IDs. This now checks to ensure that bound_iam_principal_arn is non-empty before attempting to resolve it. Fixes #3837 * Fix extraneous newline
* Remove logical.Initialize() method * More cleanup * Fix test
…estriction instead (#3849)
* Consul service address is blank Setting an explicit service address eliminates the ability for Consul to dynamically decide what it should be based on its translate_wan_addrs setting. translate_wan_addrs configures Consul to return its lan address to nodes in its same datacenter but return its wan address to nodes in foreign datacenters. * service_address parameter for Consul storage backend This parameter allows users to override the use of what Vault knows to be its HA redirect address. This option is particularly commpelling because if set to a blank string, Consul will leverage the node configuration where the service is registered which includes the `translate_wan_addrs` option. This option conditionally associates nodes' lan or wan address based on where requests originate. * Add TestConsul_ServiceAddress Ensures that the service_address configuration parameter is setting the serviceAddress field of ConsulBackend instances properly. If the "service_address" parameter is not set, the ConsulBackend serviceAddress field must instantiate as nil to indicate that it can be ignored.
This reverts commit 3d4bd6f.
Revert "Revert "Remove netbsd/arm as it won't compile"" This reverts commit 8b43db1.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.