diff --git a/CHANGELOG.md b/CHANGELOG.md index 59c44ffd77..802dc6777e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -204,11 +204,11 @@ FEATURES: * /v1/health/service/ endpoint can take an optional `?passing` flag to filter to only nodes with passing results. [GH-57] * The KV endpoint suports listing keys with the `?keys` query parameter, - and limited up to a seperator using `?seperator=`. + and limited up to a separator using `?separator=`. IMPROVEMENTS: - * Health check output goes into seperate `Output` field instead + * Health check output goes into separate `Output` field instead of overriding `Notes`. [GH-59] * Adding a minimum check interval to prevent checks with extremely low intervals fork bombing. [GH-64] @@ -227,7 +227,7 @@ BUG FIXES: * DNS parser can handler period in a tag name. [GH-39] * "application/json" content-type is sent on HTTP requests. [GH-45] * Work around for LMDB delete issue. [GH-85] - * Fixed tag gossip propogation for rapid restart. [GH-86] + * Fixed tag gossip propagation for rapid restart. [GH-86] MISC: diff --git a/acl/cache.go b/acl/cache.go index 6e7295562b..069d13ba75 100644 --- a/acl/cache.go +++ b/acl/cache.go @@ -26,7 +26,7 @@ type Cache struct { ruleCache *lru.Cache // Cache rules -> policy } -// NewCache contructs a new policy and ACL cache of a given size +// NewCache constructs a new policy and ACL cache of a given size func NewCache(size int, faultfn FaultFunc) (*Cache, error) { if size <= 0 { return nil, fmt.Errorf("Must provide positive cache size") diff --git a/command/agent/agent.go b/command/agent/agent.go index facb260b7d..cbda67e7ae 100644 --- a/command/agent/agent.go +++ b/command/agent/agent.go @@ -363,7 +363,7 @@ func (a *Agent) Leave() error { } // Shutdown is used to hard stop the agent. Should be -// preceeded by a call to Leave to do it gracefully. +// preceded by a call to Leave to do it gracefully. func (a *Agent) Shutdown() error { a.shutdownLock.Lock() defer a.shutdownLock.Unlock() diff --git a/command/agent/dns.go b/command/agent/dns.go index 43ea245df6..ec56fbfc5b 100644 --- a/command/agent/dns.go +++ b/command/agent/dns.go @@ -194,7 +194,7 @@ func (d *DNSServer) handlePtr(resp dns.ResponseWriter, req *dns.Msg) { var out structs.IndexedNodes // TODO: Replace ListNodes with an internal RPC that can do the filter - // server side to avoid transfering the entire node list. + // server side to avoid transferring the entire node list. if err := d.agent.RPC("Catalog.ListNodes", &args, &out); err == nil { for _, n := range out.Nodes { arpa, _ := dns.ReverseAddr(n.Address) diff --git a/command/agent/local.go b/command/agent/local.go index aff1353487..822546539d 100644 --- a/command/agent/local.go +++ b/command/agent/local.go @@ -52,7 +52,7 @@ type localState struct { checks map[string]*structs.HealthCheck checkStatus map[string]syncStatus - // Used to track checks that are being defered + // Used to track checks that are being deferred deferCheck map[string]*time.Timer // consulCh is used to inform of a change to the known @@ -101,13 +101,13 @@ func (l *localState) ConsulServerUp() { } } -// Pause is used to pause state syncronization, this can be +// Pause is used to pause state synchronization, this can be // used to make batch changes func (l *localState) Pause() { atomic.StoreInt32(&l.paused, 1) } -// Resume is used to resume state syncronization +// Resume is used to resume state synchronization func (l *localState) Resume() { atomic.StoreInt32(&l.paused, 0) l.changeMade() @@ -390,7 +390,7 @@ func (l *localState) syncChanges() error { return err } } else if !status.inSync { - // Cancel a defered sync + // Cancel a deferred sync if timer := l.deferCheck[id]; timer != nil { timer.Stop() delete(l.deferCheck, id) diff --git a/command/agent/local_test.go b/command/agent/local_test.go index ded25ad3d5..7595b8fc12 100644 --- a/command/agent/local_test.go +++ b/command/agent/local_test.go @@ -389,7 +389,7 @@ func TestAgentAntiEntropy_Check_DeferSync(t *testing.T) { t.Fatalf("checks: %v", check) } - // Update the check output! Should be defered + // Update the check output! Should be deferred agent.state.UpdateCheck("web", structs.HealthPassing, "output") // Should not update for 100 milliseconds @@ -408,7 +408,7 @@ func TestAgentAntiEntropy_Check_DeferSync(t *testing.T) { } } - // Wait for a defered update + // Wait for a deferred update time.Sleep(100 * time.Millisecond) if err := agent.RPC("Health.NodeChecks", &req, &checks); err != nil { t.Fatalf("err: %v", err) diff --git a/command/agent/log_writer.go b/command/agent/log_writer.go index eaae8b0df3..e6e76d0e81 100644 --- a/command/agent/log_writer.go +++ b/command/agent/log_writer.go @@ -29,7 +29,7 @@ func NewLogWriter(buf int) *logWriter { } } -// RegisterHandler adds a log handler to recieve logs, and sends +// RegisterHandler adds a log handler to receive logs, and sends // the last buffered logs to the handler func (l *logWriter) RegisterHandler(lh LogHandler) { l.Lock() diff --git a/command/agent/ui_endpoint_test.go b/command/agent/ui_endpoint_test.go index 709a6d4f9e..7872ce7bed 100644 --- a/command/agent/ui_endpoint_test.go +++ b/command/agent/ui_endpoint_test.go @@ -41,7 +41,7 @@ func TestUiIndex(t *testing.T) { t.Fatalf("err: %v", err) } - // Verify teh response + // Verify the response if resp.StatusCode != 200 { t.Fatalf("bad: %v", resp) } diff --git a/consul/pool.go b/consul/pool.go index 495ab2bd59..523cfd5253 100644 --- a/consul/pool.go +++ b/consul/pool.go @@ -114,7 +114,7 @@ func (c *Conn) returnClient(client *StreamClient) { // Consul servers. This is used to reduce the latency of // RPC requests between servers. It is only used to pool // connections in the rpcConsul mode. Raft connections -// are pooled seperately. +// are pooled separately. type ConnPool struct { sync.Mutex diff --git a/terraform/aws/scripts/server.sh b/terraform/aws/scripts/server.sh index c30588def7..779114e284 100755 --- a/terraform/aws/scripts/server.sh +++ b/terraform/aws/scripts/server.sh @@ -9,6 +9,6 @@ cat >/tmp/consul_flags << EOF export CONSUL_FLAGS="-server -bootstrap-expect=${SERVER_COUNT} -data-dir=/mnt/consul" EOF -# Write it to the full sevice file +# Write it to the full service file sudo mv /tmp/consul_flags /etc/service/consul chmod 0644 /etc/service/consul diff --git a/ui/javascripts/app/controllers.js b/ui/javascripts/app/controllers.js index 7aac6f07c5..4aad1f42ed 100644 --- a/ui/javascripts/app/controllers.js +++ b/ui/javascripts/app/controllers.js @@ -460,7 +460,7 @@ App.AclsShowController = Ember.ObjectController.extend({ }).then(function(response) { controller.transitionToRoute('acls.show', response.ID); controller.set('isLoading', false); - notify('Succesfully cloned token', 4000); + notify('Successfully cloned token', 4000); }).fail(function(response) { // Render the error message on the form if the request failed controller.set('errorMessage', 'Received error while processing: ' + response.statusText); diff --git a/ui/javascripts/libs/classie.js b/ui/javascripts/libs/classie.js index a96755488b..a70914c4f3 100755 --- a/ui/javascripts/libs/classie.js +++ b/ui/javascripts/libs/classie.js @@ -22,7 +22,7 @@ function classReg( className ) { } // classList support for class management -// altho to be fair, the api sucks because it won't accept multiple classes at once +// although to be fair, the api sucks because it won't accept multiple classes at once var hasClass, addClass, removeClass; if ( 'classList' in document.documentElement ) {