Skip to content

Commit 3d3c48b

Browse files
committed
Merge pull request #514 from vlajos/typofixes-vlajos-20141204
typofixes - https://github.com/vlajos/misspell_fixer
2 parents 1e7772d + 3b10683 commit 3d3c48b

File tree

12 files changed

+18
-18
lines changed

12 files changed

+18
-18
lines changed

CHANGELOG.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -204,11 +204,11 @@ FEATURES:
204204
* /v1/health/service/ endpoint can take an optional `?passing` flag
205205
to filter to only nodes with passing results. [GH-57]
206206
* The KV endpoint suports listing keys with the `?keys` query parameter,
207-
and limited up to a seperator using `?seperator=`.
207+
and limited up to a separator using `?separator=`.
208208

209209
IMPROVEMENTS:
210210

211-
* Health check output goes into seperate `Output` field instead
211+
* Health check output goes into separate `Output` field instead
212212
of overriding `Notes`. [GH-59]
213213
* Adding a minimum check interval to prevent checks with extremely
214214
low intervals fork bombing. [GH-64]
@@ -227,7 +227,7 @@ BUG FIXES:
227227
* DNS parser can handler period in a tag name. [GH-39]
228228
* "application/json" content-type is sent on HTTP requests. [GH-45]
229229
* Work around for LMDB delete issue. [GH-85]
230-
* Fixed tag gossip propogation for rapid restart. [GH-86]
230+
* Fixed tag gossip propagation for rapid restart. [GH-86]
231231

232232
MISC:
233233

acl/cache.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ type Cache struct {
2626
ruleCache *lru.Cache // Cache rules -> policy
2727
}
2828

29-
// NewCache contructs a new policy and ACL cache of a given size
29+
// NewCache constructs a new policy and ACL cache of a given size
3030
func NewCache(size int, faultfn FaultFunc) (*Cache, error) {
3131
if size <= 0 {
3232
return nil, fmt.Errorf("Must provide positive cache size")

command/agent/agent.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,7 @@ func (a *Agent) Leave() error {
363363
}
364364

365365
// Shutdown is used to hard stop the agent. Should be
366-
// preceeded by a call to Leave to do it gracefully.
366+
// preceded by a call to Leave to do it gracefully.
367367
func (a *Agent) Shutdown() error {
368368
a.shutdownLock.Lock()
369369
defer a.shutdownLock.Unlock()

command/agent/dns.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ func (d *DNSServer) handlePtr(resp dns.ResponseWriter, req *dns.Msg) {
194194
var out structs.IndexedNodes
195195

196196
// TODO: Replace ListNodes with an internal RPC that can do the filter
197-
// server side to avoid transfering the entire node list.
197+
// server side to avoid transferring the entire node list.
198198
if err := d.agent.RPC("Catalog.ListNodes", &args, &out); err == nil {
199199
for _, n := range out.Nodes {
200200
arpa, _ := dns.ReverseAddr(n.Address)

command/agent/local.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ type localState struct {
5252
checks map[string]*structs.HealthCheck
5353
checkStatus map[string]syncStatus
5454

55-
// Used to track checks that are being defered
55+
// Used to track checks that are being deferred
5656
deferCheck map[string]*time.Timer
5757

5858
// consulCh is used to inform of a change to the known
@@ -101,13 +101,13 @@ func (l *localState) ConsulServerUp() {
101101
}
102102
}
103103

104-
// Pause is used to pause state syncronization, this can be
104+
// Pause is used to pause state synchronization, this can be
105105
// used to make batch changes
106106
func (l *localState) Pause() {
107107
atomic.StoreInt32(&l.paused, 1)
108108
}
109109

110-
// Resume is used to resume state syncronization
110+
// Resume is used to resume state synchronization
111111
func (l *localState) Resume() {
112112
atomic.StoreInt32(&l.paused, 0)
113113
l.changeMade()
@@ -390,7 +390,7 @@ func (l *localState) syncChanges() error {
390390
return err
391391
}
392392
} else if !status.inSync {
393-
// Cancel a defered sync
393+
// Cancel a deferred sync
394394
if timer := l.deferCheck[id]; timer != nil {
395395
timer.Stop()
396396
delete(l.deferCheck, id)

command/agent/local_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@ func TestAgentAntiEntropy_Check_DeferSync(t *testing.T) {
389389
t.Fatalf("checks: %v", check)
390390
}
391391

392-
// Update the check output! Should be defered
392+
// Update the check output! Should be deferred
393393
agent.state.UpdateCheck("web", structs.HealthPassing, "output")
394394

395395
// Should not update for 100 milliseconds
@@ -408,7 +408,7 @@ func TestAgentAntiEntropy_Check_DeferSync(t *testing.T) {
408408
}
409409
}
410410

411-
// Wait for a defered update
411+
// Wait for a deferred update
412412
time.Sleep(100 * time.Millisecond)
413413
if err := agent.RPC("Health.NodeChecks", &req, &checks); err != nil {
414414
t.Fatalf("err: %v", err)

command/agent/log_writer.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ func NewLogWriter(buf int) *logWriter {
2929
}
3030
}
3131

32-
// RegisterHandler adds a log handler to recieve logs, and sends
32+
// RegisterHandler adds a log handler to receive logs, and sends
3333
// the last buffered logs to the handler
3434
func (l *logWriter) RegisterHandler(lh LogHandler) {
3535
l.Lock()

command/agent/ui_endpoint_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ func TestUiIndex(t *testing.T) {
4141
t.Fatalf("err: %v", err)
4242
}
4343

44-
// Verify teh response
44+
// Verify the response
4545
if resp.StatusCode != 200 {
4646
t.Fatalf("bad: %v", resp)
4747
}

consul/pool.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ func (c *Conn) returnClient(client *StreamClient) {
114114
// Consul servers. This is used to reduce the latency of
115115
// RPC requests between servers. It is only used to pool
116116
// connections in the rpcConsul mode. Raft connections
117-
// are pooled seperately.
117+
// are pooled separately.
118118
type ConnPool struct {
119119
sync.Mutex
120120

terraform/aws/scripts/server.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ cat >/tmp/consul_flags << EOF
99
export CONSUL_FLAGS="-server -bootstrap-expect=${SERVER_COUNT} -data-dir=/mnt/consul"
1010
EOF
1111

12-
# Write it to the full sevice file
12+
# Write it to the full service file
1313
sudo mv /tmp/consul_flags /etc/service/consul
1414
chmod 0644 /etc/service/consul

ui/javascripts/app/controllers.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -460,7 +460,7 @@ App.AclsShowController = Ember.ObjectController.extend({
460460
}).then(function(response) {
461461
controller.transitionToRoute('acls.show', response.ID);
462462
controller.set('isLoading', false);
463-
notify('Succesfully cloned token', 4000);
463+
notify('Successfully cloned token', 4000);
464464
}).fail(function(response) {
465465
// Render the error message on the form if the request failed
466466
controller.set('errorMessage', 'Received error while processing: ' + response.statusText);

ui/javascripts/libs/classie.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ function classReg( className ) {
2222
}
2323

2424
// classList support for class management
25-
// altho to be fair, the api sucks because it won't accept multiple classes at once
25+
// although to be fair, the api sucks because it won't accept multiple classes at once
2626
var hasClass, addClass, removeClass;
2727

2828
if ( 'classList' in document.documentElement ) {

0 commit comments

Comments
 (0)