Skip to content

Commit

Permalink
Merge pull request kubernetes#24282 from goltermann/spelling
Browse files Browse the repository at this point in the history
Automatic merge from submit-queue

Fix misspellings in comments
  • Loading branch information
k8s-merge-robot committed Apr 19, 2016
2 parents 9ae35f8 + c226c94 commit db28f73
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion cmd/libs/go2idl/generator/generator.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ type Package interface {
Path() string

// Filter should return true if this package cares about this type.
// Otherwise, this type will be ommitted from the type ordering for
// Otherwise, this type will be omitted from the type ordering for
// this package.
Filter(*Context, *types.Type) bool

Expand Down
2 changes: 1 addition & 1 deletion contrib/mesos/pkg/scheduler/podtask/procurement.go
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ func (a AllOrNothingProcurement) Procure(t *T, n *api.Node, ps *ProcureState) er
// NewNodeProcurement returns a Procurement that checks whether the given pod task and offer
// have valid node informations available and wehther the pod spec node selector matches
// the pod labels.
// If the check is successfull the slave ID and assigned slave is set in the given Spec.
// If the check is successful the slave ID and assigned slave is set in the given Spec.
func NewNodeProcurement() Procurement {
return ProcurementFunc(func(t *T, n *api.Node, ps *ProcureState) error {
// if the user has specified a target host, make sure this offer is for that host
Expand Down
2 changes: 1 addition & 1 deletion pkg/client/unversioned/clientcmd/api/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ type Config struct {
// DEPRECATED: APIVersion is the preferred api version for communicating with the kubernetes cluster (v1, v2, etc).
// Because a cluster can run multiple API groups and potentially multiple versions of each, it no longer makes sense to specify
// a single value for the cluster version.
// This field isnt really needed anyway, so we are deprecating it without replacement.
// This field isn't really needed anyway, so we are deprecating it without replacement.
// It will be ignored if it is present.
APIVersion string `json:"apiVersion,omitempty"`
// Preferences holds general information to be use for cli interactions
Expand Down
2 changes: 1 addition & 1 deletion pkg/client/unversioned/clientcmd/api/v1/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ type Config struct {
// DEPRECATED: APIVersion is the preferred api version for communicating with the kubernetes cluster (v1, v2, etc).
// Because a cluster can run multiple API groups and potentially multiple versions of each, it no longer makes sense to specify
// a single value for the cluster version.
// This field isnt really needed anyway, so we are deprecating it without replacement.
// This field isn't really needed anyway, so we are deprecating it without replacement.
// It will be ignored if it is present.
APIVersion string `json:"apiVersion,omitempty"`
// Preferences holds general information to be use for cli interactions
Expand Down
2 changes: 1 addition & 1 deletion pkg/cloudprovider/providers/aws/aws.go
Original file line number Diff line number Diff line change
Expand Up @@ -1947,7 +1947,7 @@ func findTag(tags []*ec2.Tag, key string) (string, bool) {
}

// Finds the subnets associated with the cluster, by matching tags.
// For maximal backwards compatability, if no subnets are tagged, it will fall-back to the current subnet.
// For maximal backwards compatibility, if no subnets are tagged, it will fall-back to the current subnet.
// However, in future this will likely be treated as an error.
func (c *AWSCloud) findSubnets() ([]*ec2.Subnet, error) {
request := &ec2.DescribeSubnetsInput{}
Expand Down
4 changes: 2 additions & 2 deletions pkg/controller/namespace/namespace_controller_utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ func deleteEachItem(
}

// deleteAllContentForGroupVersionResource will use the dynamic client to delete each resource identified in gvr.
// It returns an estimate of the time remaining before the remaing resources are deleted.
// It returns an estimate of the time remaining before the remaining resources are deleted.
// If estimate > 0, not all resources are guaranteed to be gone.
func deleteAllContentForGroupVersionResource(
kubeClient clientset.Interface,
Expand Down Expand Up @@ -304,7 +304,7 @@ func deleteAllContentForGroupVersionResource(
}

// deleteAllContent will use the dynamic client to delete each resource identified in groupVersionResources.
// It returns an estimate of the time remaining before the remaing resources are deleted.
// It returns an estimate of the time remaining before the remaining resources are deleted.
// If estimate > 0, not all resources are guaranteed to be gone.
func deleteAllContent(
kubeClient clientset.Interface,
Expand Down
4 changes: 2 additions & 2 deletions test/e2e/volume_provisioning.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ const (
// Requested size of the volume
requestedSize = "1500Mi"
// Expected size of the volume is 2GiB, because all three supported cloud
// providers allocate volumes in 1GiB chunks.
// providers allocate volumes in 1GiB chunks.
expectedSize = "2Gi"
)

Expand Down Expand Up @@ -91,7 +91,7 @@ var _ = framework.KubeDescribe("Dynamic provisioning", func() {
// We start two pods:
// - The first writes 'hello word' to the /mnt/test (= the volume).
// - The second one runs grep 'hello world' on /mnt/test.
// If both suceed, Kubernetes actually allocated something that is
// If both succeed, Kubernetes actually allocated something that is
// persistent across pods.
By("checking the created volume is writable")
runInPodWithVolume(c, ns, claim.Name, "echo 'hello world' > /mnt/test/data")
Expand Down

0 comments on commit db28f73

Please sign in to comment.