Merge pull request #2979 from lfarnell/cleanup

Code cleanup

command/agent/config.go

@@ -374,7 +374,7 @@ type Telemetry struct {
 	// check, it will *NOT* be activated. This setting overrides that behavior.
 	// Default: "false"
 	CirconusCheckForceMetricActivation string `mapstructure:"circonus_check_force_metric_activation"`
-	// CirconusCheckInstanceID serves to uniquely identify the metrics comming from this "instance".
+	// CirconusCheckInstanceID serves to uniquely identify the metrics coming from this "instance".
 	// It can be used to maintain metric continuity with transient or ephemeral instances as
 	// they move around within an infrastructure.
 	// Default: hostname:app
@@ -441,7 +441,7 @@ type Resources struct {
 }
 
 // ParseReserved expands the ReservedPorts string into a slice of port numbers.
-// The supported syntax is comma seperated integers or ranges seperated by
+// The supported syntax is comma separated integers or ranges separated by
 // hyphens. For example, "80,120-150,160"
 func (r *Resources) ParseReserved() error {
 	parts := strings.Split(r.ReservedPorts, ",")

command/agent/consul/client.go

@@ -516,7 +516,7 @@ func (c *ServiceClient) checkRegs(ops *operations, allocID, serviceID string, se
 	return nil
 }
 
-// RegisterTask with Consul. Adds all sevice entries and checks to Consul. If
+// RegisterTask with Consul. Adds all service entries and checks to Consul. If
 // exec is nil and a script check exists an error is returned.
 //
 // If the service IP is set it used as the address in the service registration.
@@ -555,7 +555,7 @@ func (c *ServiceClient) UpdateTask(allocID string, existing, newTask *structs.Ta
 	for existingID, existingSvc := range existingIDs {
 		newSvc, ok := newIDs[existingID]
 		if !ok {
-			// Existing sevice entry removed
+			// Existing service entry removed
 			ops.deregServices = append(ops.deregServices, existingID)
 			for _, check := range existingSvc.Checks {
 				ops.deregChecks = append(ops.deregChecks, makeCheckID(existingID, check))

command/agent/consul/unit_test.go

@@ -442,7 +442,7 @@ func TestConsul_ChangePorts(t *testing.T) {
 				t.Errorf("expected Port y=%v but found: %v", expected, v.HTTP)
 			}
 		default:
-			t.Errorf("Unkown check: %q", k)
+			t.Errorf("Unknown check: %q", k)
 		}
 	}
 }
@@ -542,7 +542,7 @@ func TestConsul_ChangeChecks(t *testing.T) {
 				t.Errorf("expected Port x=%v but found: %v", expected, v.HTTP)
 			}
 		default:
-			t.Errorf("Unkown check: %q", k)
+			t.Errorf("Unknown check: %q", k)
 		}
 	}
 }

command/agent/fs_endpoint.go

@@ -423,7 +423,7 @@ func (s *StreamFramer) readData() []byte {
 
 // Send creates and sends a StreamFrame based on the passed parameters. An error
 // is returned if the run routine hasn't run or encountered an error. Send is
-// asyncronous and does not block for the data to be transferred.
+// asynchronous and does not block for the data to be transferred.
 func (s *StreamFramer) Send(file, fileEvent string, data []byte, offset int64) error {
 	s.l.Lock()
 	defer s.l.Unlock()

command/agent/fs_endpoint_test.go

@@ -1201,7 +1201,7 @@ func TestLogs_findClosest(t *testing.T) {
 			Error:      true,
 		},
 
-		// Test begining cases
+		// Test beginning cases
 		{
 			Entries:      entries,
 			DesiredIdx:   0,

command/check.go

@@ -35,7 +35,7 @@ Agent Check Options:
      Minimum number of peers that a server is expected to know.
 
   -min-servers
-     Minumum number of servers that a client is expected to know.
+     Minimum number of servers that a client is expected to know.
 `
 
 	return strings.TrimSpace(helpText)

command/fs.go

@@ -21,7 +21,7 @@ const (
 	bytesToLines int64 = 120
 
 	// defaultTailLines is the number of lines to tail by default if the value
-	// is not overriden.
+	// is not overridden.
 	defaultTailLines int64 = 10
 )
 

command/job_dispatch.go

@@ -18,7 +18,7 @@ func (c *JobDispatchCommand) Help() string {
 Usage: nomad job dispatch [options] <parameterized job> [input source]
 
 Dispatch creates an instance of a parameterized job. A data payload to the
-dispatched instance can be provided via stdin by using "-" or by specifiying a
+dispatched instance can be provided via stdin by using "-" or by specifying a
 path to a file. Metadata can be supplied by using the meta flag one or more
 times. 
 
@@ -33,9 +33,9 @@ General Options:
 Dispatch Options:
 
   -meta <key>=<value>
-    Meta takes a key/value pair seperated by "=". The metadata key will be
+    Meta takes a key/value pair separated by "=". The metadata key will be
     merged into the job's metadata. The job may define a default value for the
-    key which is overriden when dispatching. The flag can be provided more than
+    key which is overridden when dispatching. The flag can be provided more than
     once to inject multiple metadata key/value pairs. Arbitrary keys are not
     allowed. The parameterized job must allow the key to be merged.
     

command/job_history.go

@@ -21,7 +21,7 @@ Usage: nomad job history [options] <job>
 
 History is used to display the known versions of a particular job. The command
 can display the diff between job versions and can be useful for understanding
-the changes that occured to the job as well as deciding job versions to revert
+the changes that occurred to the job as well as deciding job versions to revert
 to.
 
 General Options: