kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #1284 from liubin/fix-typos

Browse source 
fix typos
This commit is contained in:
Jana Radhakrishnan 2016-08-01 09:49:00 -07:00 • committed by GitHub
commit b0f5f02224
6 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libnetwork/drivers/macvlan/macvlan_state.go
View file

@ -31,7 +31,7 @@ func (d *driver) deleteNetwork(nid string) {
d.Unlock() d.Unlock()
} }
// getNetworks Safely returns a slice of existng networks // getNetworks Safely returns a slice of existing networks
func (d *driver) getNetworks() []*network { func (d *driver) getNetworks() []*network {
d.Lock() d.Lock()
defer d.Unlock() defer d.Unlock()

2
libnetwork/hostdiscovery/hostdiscovery_api.go
View file

@ -15,7 +15,7 @@ type LeaveCallback func(entries []net.IP)
type HostDiscovery interface { type HostDiscovery interface {
//Watch Node join and leave cluster events //Watch Node join and leave cluster events
Watch(activeCallback ActiveCallback, joinCallback JoinCallback, leaveCallback LeaveCallback) error Watch(activeCallback ActiveCallback, joinCallback JoinCallback, leaveCallback LeaveCallback) error
// StopDiscovery stops the discovery perocess // StopDiscovery stops the discovery process
StopDiscovery() error StopDiscovery() error
// Fetch returns a list of host IPs that are currently discovered // Fetch returns a list of host IPs that are currently discovered
Fetch() []net.IP Fetch() []net.IP

2
libnetwork/ipams/remote/api/api.go
View file

@ -26,7 +26,7 @@ type GetCapabilityResponse struct {
RequiresRequestReplay bool RequiresRequestReplay bool
} }
// ToCapability converts the capability response into the internal ipam driver capaility structure // ToCapability converts the capability response into the internal ipam driver capability structure
func (capRes GetCapabilityResponse) ToCapability() *ipamapi.Capability { func (capRes GetCapabilityResponse) ToCapability() *ipamapi.Capability {
return &ipamapi.Capability{ return &ipamapi.Capability{
RequiresMACAddress: capRes.RequiresMACAddress, RequiresMACAddress: capRes.RequiresMACAddress,

4
libnetwork/netutils/utils_linux.go
View file

@ -63,7 +63,7 @@ func GenerateIfaceName(nlh *netlink.Handle, prefix string, len int) (string, err
// ElectInterfaceAddresses looks for an interface on the OS with the // ElectInterfaceAddresses looks for an interface on the OS with the
// specified name and returns its IPv4 and IPv6 addresses in CIDR // specified name and returns its IPv4 and IPv6 addresses in CIDR
// form. If the interface does not exist, it chooses from a predifined // form. If the interface does not exist, it chooses from a predefined
// list the first IPv4 address which does not conflict with other // list the first IPv4 address which does not conflict with other
// interfaces on the system. // interfaces on the system.
func ElectInterfaceAddresses(name string) (*net.IPNet, []*net.IPNet, error) { func ElectInterfaceAddresses(name string) (*net.IPNet, []*net.IPNet, error) {
@ -94,7 +94,7 @@ func ElectInterfaceAddresses(name string) (*net.IPNet, []*net.IPNet, error) {
} }
if link == nil || v4Net == nil { if link == nil || v4Net == nil {
// Choose from predifined broad networks // Choose from predefined broad networks
v4Net, err = FindAvailableNetwork(ipamutils.PredefinedBroadNetworks) v4Net, err = FindAvailableNetwork(ipamutils.PredefinedBroadNetworks)
if err != nil { if err != nil {
return nil, nil, err return nil, nil, err

2
libnetwork/osl/interface_linux.go
View file

@ -140,7 +140,7 @@ func (i *nwIface) Remove() error {
nlh := n.nlHandle nlh := n.nlHandle
n.Unlock() n.Unlock()
// Find the network inteerface identified by the DstName attribute. // Find the network interface identified by the DstName attribute.
iface, err := nlh.LinkByName(i.DstName()) iface, err := nlh.LinkByName(i.DstName())
if err != nil { if err != nil {
return err return err

2
libnetwork/sandbox_dns_unix.go
View file

@ -290,7 +290,7 @@ func (sb *sandbox) updateDNS(ipv6Enabled bool) error {
} }
// Embedded DNS server has to be enabled for this sandbox. Rebuild the container's // Embedded DNS server has to be enabled for this sandbox. Rebuild the container's
// resolv.conf by doing the follwing // resolv.conf by doing the following
// - Save the external name servers in resolv.conf in the sandbox // - Save the external name servers in resolv.conf in the sandbox
// - Add only the embedded server's IP to container's resolv.conf // - Add only the embedded server's IP to container's resolv.conf
// - If the embedded server needs any resolv.conf options add it to the current list // - If the embedded server needs any resolv.conf options add it to the current list