Speling police
This commit is contained in:
parent
811f97f938
commit
b20f86b4c7
|
@ -595,7 +595,7 @@ func TestACLResolution(t *testing.T) {
|
|||
t.Fatalf("bad: %s", token)
|
||||
}
|
||||
|
||||
// Querystring token has precendence over header and agent tokens
|
||||
// Querystring token has precedence over header and agent tokens
|
||||
srv.parseToken(reqBothTokens, &token)
|
||||
if token != "baz" {
|
||||
t.Fatalf("bad: %s", token)
|
||||
|
|
|
@ -268,7 +268,7 @@ func (c *ExecCommand) waitForJob() int {
|
|||
errCh := make(chan struct{}, 1)
|
||||
defer close(doneCh)
|
||||
go c.streamResults(doneCh, ackCh, heartCh, outputCh, exitCh, errCh)
|
||||
target := &TargettedUi{Ui: c.Ui}
|
||||
target := &TargetedUi{Ui: c.Ui}
|
||||
|
||||
var ackCount, exitCount, badExit int
|
||||
OUTER:
|
||||
|
@ -637,33 +637,33 @@ Options:
|
|||
return strings.TrimSpace(helpText)
|
||||
}
|
||||
|
||||
// TargettedUi is a UI that wraps another UI implementation and modifies
|
||||
// TargetedUi is a UI that wraps another UI implementation and modifies
|
||||
// the output to indicate a specific target. Specifically, all Say output
|
||||
// is prefixed with the target name. Message output is not prefixed but
|
||||
// is offset by the length of the target so that output is lined up properly
|
||||
// with Say output. Machine-readable output has the proper target set.
|
||||
type TargettedUi struct {
|
||||
type TargetedUi struct {
|
||||
Target string
|
||||
Ui cli.Ui
|
||||
}
|
||||
|
||||
func (u *TargettedUi) Ask(query string) (string, error) {
|
||||
func (u *TargetedUi) Ask(query string) (string, error) {
|
||||
return u.Ui.Ask(u.prefixLines(true, query))
|
||||
}
|
||||
|
||||
func (u *TargettedUi) Info(message string) {
|
||||
func (u *TargetedUi) Info(message string) {
|
||||
u.Ui.Info(u.prefixLines(true, message))
|
||||
}
|
||||
|
||||
func (u *TargettedUi) Output(message string) {
|
||||
func (u *TargetedUi) Output(message string) {
|
||||
u.Ui.Output(u.prefixLines(false, message))
|
||||
}
|
||||
|
||||
func (u *TargettedUi) Error(message string) {
|
||||
func (u *TargetedUi) Error(message string) {
|
||||
u.Ui.Error(u.prefixLines(true, message))
|
||||
}
|
||||
|
||||
func (u *TargettedUi) prefixLines(arrow bool, message string) string {
|
||||
func (u *TargetedUi) prefixLines(arrow bool, message string) string {
|
||||
arrowText := "==>"
|
||||
if !arrow {
|
||||
arrowText = strings.Repeat(" ", len(arrowText))
|
||||
|
|
|
@ -7,7 +7,7 @@ $enterprise-bnr-consul-color: #B52A55;
|
|||
$enterprise-color-dark-white: #A9B1B5;
|
||||
|
||||
body{
|
||||
// when _announcment-bnr.erb (ie. Consul Enterprise Announcment) is being used in layout we need to push down content to accomodate
|
||||
// when _announcment-bnr.erb (ie. Consul Enterprise Announcment) is being used in layout we need to push down content to accommodate
|
||||
// add this class to body
|
||||
&.-displaying-bnr{
|
||||
#header{
|
||||
|
|
|
@ -19,7 +19,7 @@ starting the Consul agent. The key can be set via the `encrypt` parameter: the
|
|||
value of this setting is a configuration file containing the encryption key.
|
||||
|
||||
The key must be 16-bytes, Base64 encoded. As a convenience, Consul provides the
|
||||
[`consul keygen`](/docs/commands/keygen.html) commmand to generate a
|
||||
[`consul keygen`](/docs/commands/keygen.html) command to generate a
|
||||
cryptographically suitable key:
|
||||
|
||||
```text
|
||||
|
|
|
@ -116,7 +116,7 @@ The options below are all specified on the command-line.
|
|||
configuration files to load. Consul will
|
||||
load all files in this directory with the suffix ".json". The load order
|
||||
is alphabetical, and the the same merge routine is used as with the
|
||||
[`config-file`](#_config_file) option above. This option can be specified mulitple times
|
||||
[`config-file`](#_config_file) option above. This option can be specified multiple times
|
||||
to load multiple directories. Sub-directories of the config directory are not loaded.
|
||||
For more information on the format of the configuration files, see the
|
||||
[Configuration Files](#configuration_files) section.
|
||||
|
@ -402,7 +402,7 @@ Consul will not enable TLS for the HTTP API unless the `https` port has been ass
|
|||
the [`-advertise-wan` command-line flag](#_advertise-wan).
|
||||
|
||||
* <a name="atlas_acl_token"></a><a href="#atlas_acl_token">`atlas_acl_token`</a> When provided,
|
||||
any requests made by Atlas will use this ACL token unless explicitly overriden. When not provided
|
||||
any requests made by Atlas will use this ACL token unless explicitly overridden. When not provided
|
||||
the [`acl_token`](#acl_token) is used. This can be set to 'anonymous' to reduce permission below
|
||||
that of [`acl_token`](#acl_token).
|
||||
|
||||
|
|
|
@ -87,8 +87,8 @@ cycle the service's port AND the tags would revert to the original value and
|
|||
all modifications would be lost. It's important to note that this applies only
|
||||
to the locally registered service. If you have multiple nodes all registering
|
||||
the same service their `enableTagOverride` configuration and all other service
|
||||
configuration items are independant of one another. Updating the tags for
|
||||
the service registered on one node is independant of the same service (by name)
|
||||
configuration items are independent of one another. Updating the tags for
|
||||
the service registered on one node is independent of the same service (by name)
|
||||
registered on another node. If `enableTagOverride` is not specified the default
|
||||
value is false. See [anti-entropy syncs](/docs/internals/anti-entropy.html)
|
||||
for more info.
|
||||
|
|
|
@ -150,7 +150,7 @@ access to each API token based on the events they should be able to fire.
|
|||
### Blacklist mode and Prepared Queries
|
||||
|
||||
After Consul 0.6.3, significant changes were made to ACLs for prepared queries,
|
||||
incuding a new `query` ACL policy. See [Prepared Query ACLs](#prepared_query_acls) below for more details.
|
||||
including a new `query` ACL policy. See [Prepared Query ACLs](#prepared_query_acls) below for more details.
|
||||
|
||||
### Blacklist mode and Keyring Operations
|
||||
|
||||
|
|
Loading…
Reference in New Issue