Merge pull request #1576 from daehyeok/misspell

Fixed misspelling
This commit is contained in:
Madhu Venugopal 2016-12-02 16:02:23 -08:00 committed by GitHub
commit 224a73d60b
8 changed files with 13 additions and 13 deletions

View File

@ -1,5 +1,5 @@
// Package bitseq provides a structure and utilities for representing long bitmask // Package bitseq provides a structure and utilities for representing long bitmask
// as sequence of run-lenght encoded blocks. It operates direclty on the encoded // as sequence of run-length encoded blocks. It operates directly on the encoded
// representation, it does not decode/encode. // representation, it does not decode/encode.
package bitseq package bitseq

View File

@ -312,7 +312,7 @@ func (c *controller) clusterAgentInit() {
c.clusterConfigAvailable = true c.clusterConfigAvailable = true
keys := c.keys keys := c.keys
c.Unlock() c.Unlock()
// agent initialization needs encyrption keys and bind/remote IP which // agent initialization needs encryption keys and bind/remote IP which
// comes from the daemon cluster events // comes from the daemon cluster events
if len(keys) > 0 { if len(keys) > 0 {
c.agentSetup() c.agentSetup()
@ -786,7 +786,7 @@ func (c *controller) reservePools() {
} }
for _, ep := range epl { for _, ep := range epl {
if err := ep.assignAddress(ipam, true, ep.Iface().AddressIPv6() != nil); err != nil { if err := ep.assignAddress(ipam, true, ep.Iface().AddressIPv6() != nil); err != nil {
logrus.Warnf("Failed to reserve current adress for endpoint %q (%s) on network %q (%s)", logrus.Warnf("Failed to reserve current address for endpoint %q (%s) on network %q (%s)",
ep.Name(), ep.ID(), n.Name(), n.ID()) ep.Name(), ep.ID(), n.Name(), n.ID())
} }
} }

View File

@ -71,7 +71,7 @@ func (n *bridgeNetwork) setupIPTables(config *networkConfiguration, i *bridgeInt
return fmt.Errorf("Cannot program chains, EnableIPTable is disabled") return fmt.Errorf("Cannot program chains, EnableIPTable is disabled")
} }
// Pickup this configuraton option from driver // Pickup this configuration option from driver
hairpinMode := !driverConfig.EnableUserlandProxy hairpinMode := !driverConfig.EnableUserlandProxy
maskedAddrv4 := &net.IPNet{ maskedAddrv4 := &net.IPNet{

View File

@ -99,7 +99,7 @@ func Init(dc driverapi.DriverCallback, config map[string]interface{}) error {
// outside of the restore path can potentially fix the network join and succeed. // outside of the restore path can potentially fix the network join and succeed.
for nid, n := range d.networks { for nid, n := range d.networks {
if n.initErr != nil { if n.initErr != nil {
logrus.Infof("resetting init error and once variable for network %s after unsuccesful endpoint restore: %v", nid, n.initErr) logrus.Infof("resetting init error and once variable for network %s after unsuccessful endpoint restore: %v", nid, n.initErr)
n.initErr = nil n.initErr = nil
n.once = &sync.Once{} n.once = &sync.Once{}
} }

View File

@ -993,7 +993,7 @@ func (c *networkConfiguration) Conflicts(o *networkConfiguration) error {
return fmt.Errorf("same configuration") return fmt.Errorf("same configuration")
} }
// Also empty, becasue only one network with empty name is allowed // Also empty, because only one network with empty name is allowed
if c.BridgeName == o.BridgeName { if c.BridgeName == o.BridgeName {
return fmt.Errorf("networks have same bridge name") return fmt.Errorf("networks have same bridge name")
} }

View File

@ -47,7 +47,7 @@ type Handle struct {
// New provides a new ipvs handle in the namespace pointed to by the // New provides a new ipvs handle in the namespace pointed to by the
// passed path. It will return a valid handle or an error in case an // passed path. It will return a valid handle or an error in case an
// error occured while creating the handle. // error occurred while creating the handle.
func New(path string) (*Handle, error) { func New(path string) (*Handle, error) {
setup() setup()

View File

@ -54,7 +54,7 @@ func (n *network) startResolver() {
logrus.Errorf("Resolver Setup/Start failed for container %s, %q", n.Name(), err) logrus.Errorf("Resolver Setup/Start failed for container %s, %q", n.Name(), err)
time.Sleep(1 * time.Second) time.Sleep(1 * time.Second)
} else { } else {
logrus.Debugf("Resolver bound successfuly for network %s", n.Name()) logrus.Debugf("Resolver bound successfully for network %s", n.Name())
n.resolver = append(n.resolver, resolver) n.resolver = append(n.resolver, resolver)
break break
} }

View File

@ -244,7 +244,7 @@ func (nDB *NetworkDB) getEntry(tname, nid, key string) (*entry, error) {
// CreateEntry creates a table entry in NetworkDB for given (network, // CreateEntry creates a table entry in NetworkDB for given (network,
// table, key) tuple and if the NetworkDB is part of the cluster // table, key) tuple and if the NetworkDB is part of the cluster
// propogates this event to the cluster. It is an error to create an // propagates this event to the cluster. It is an error to create an
// entry for the same tuple for which there is already an existing // entry for the same tuple for which there is already an existing
// entry unless the current entry is deleting state. // entry unless the current entry is deleting state.
func (nDB *NetworkDB) CreateEntry(tname, nid, key string, value []byte) error { func (nDB *NetworkDB) CreateEntry(tname, nid, key string, value []byte) error {
@ -279,7 +279,7 @@ func (nDB *NetworkDB) CreateEntry(tname, nid, key string, value []byte) error {
// UpdateEntry updates a table entry in NetworkDB for given (network, // UpdateEntry updates a table entry in NetworkDB for given (network,
// table, key) tuple and if the NetworkDB is part of the cluster // table, key) tuple and if the NetworkDB is part of the cluster
// propogates this event to the cluster. It is an error to update a // propagates this event to the cluster. It is an error to update a
// non-existent entry. // non-existent entry.
func (nDB *NetworkDB) UpdateEntry(tname, nid, key string, value []byte) error { func (nDB *NetworkDB) UpdateEntry(tname, nid, key string, value []byte) error {
if _, err := nDB.GetEntry(tname, nid, key); err != nil { if _, err := nDB.GetEntry(tname, nid, key); err != nil {
@ -307,7 +307,7 @@ func (nDB *NetworkDB) UpdateEntry(tname, nid, key string, value []byte) error {
// DeleteEntry deletes a table entry in NetworkDB for given (network, // DeleteEntry deletes a table entry in NetworkDB for given (network,
// table, key) tuple and if the NetworkDB is part of the cluster // table, key) tuple and if the NetworkDB is part of the cluster
// propogates this event to the cluster. // propagates this event to the cluster.
func (nDB *NetworkDB) DeleteEntry(tname, nid, key string) error { func (nDB *NetworkDB) DeleteEntry(tname, nid, key string) error {
value, err := nDB.GetEntry(tname, nid, key) value, err := nDB.GetEntry(tname, nid, key)
if err != nil { if err != nil {
@ -408,7 +408,7 @@ func (nDB *NetworkDB) WalkTable(tname string, fn func(string, string, []byte) bo
return nil return nil
} }
// JoinNetwork joins this node to a given network and propogates this // JoinNetwork joins this node to a given network and propagates this
// event across the cluster. This triggers this node joining the // event across the cluster. This triggers this node joining the
// sub-cluster of this network and participates in the network-scoped // sub-cluster of this network and participates in the network-scoped
// gossip and bulk sync for this network. // gossip and bulk sync for this network.
@ -447,7 +447,7 @@ func (nDB *NetworkDB) JoinNetwork(nid string) error {
return nil return nil
} }
// LeaveNetwork leaves this node from a given network and propogates // LeaveNetwork leaves this node from a given network and propagates
// this event across the cluster. This triggers this node leaving the // this event across the cluster. This triggers this node leaving the
// sub-cluster of this network and as a result will no longer // sub-cluster of this network and as a result will no longer
// participate in the network-scoped gossip and bulk sync for this // participate in the network-scoped gossip and bulk sync for this