Forráskód Böngészése

Merge pull request #2264 from halfcrazy/fix/typo

Fix typos in comments
Christopher Adam Telfer 6 éve
szülő
commit
02bee778e8

+ 1 - 1
libnetwork/bitseq/sequence.go

@@ -32,7 +32,7 @@ var (
 	ErrBitAllocated = errors.New("requested bit is already allocated")
 )
 
-// Handle contains the sequece representing the bitmask and its identifier
+// Handle contains the sequence representing the bitmask and its identifier
 type Handle struct {
 	bits       uint64
 	unselected uint64

+ 4 - 4
libnetwork/cmd/networkdb-test/dbclient/ndbClient.go

@@ -368,9 +368,9 @@ func doClusterPeers(ips []string, args []string) {
 			if node.result != expectedPeers {
 				failed = true
 				if retry == maxRetry-1 {
-					log.Fatalf("Expected peers from %s missmatch %d != %d", node.id, expectedPeers, node.result)
+					log.Fatalf("Expected peers from %s mismatch %d != %d", node.id, expectedPeers, node.result)
 				} else {
-					logrus.Warnf("Expected peers from %s missmatch %d != %d", node.id, expectedPeers, node.result)
+					logrus.Warnf("Expected peers from %s mismatch %d != %d", node.id, expectedPeers, node.result)
 				}
 				time.Sleep(1 * time.Second)
 			}
@@ -429,9 +429,9 @@ func doNetworkPeers(ips []string, args []string) {
 			if node.result != expectedPeers {
 				failed = true
 				if retry == maxRetry-1 {
-					log.Fatalf("Expected peers from %s missmatch %d != %d", node.id, expectedPeers, node.result)
+					log.Fatalf("Expected peers from %s mismatch %d != %d", node.id, expectedPeers, node.result)
 				} else {
-					logrus.Warnf("Expected peers from %s missmatch %d != %d", node.id, expectedPeers, node.result)
+					logrus.Warnf("Expected peers from %s mismatch %d != %d", node.id, expectedPeers, node.result)
 				}
 				time.Sleep(1 * time.Second)
 			}

+ 1 - 1
libnetwork/diagnostic/server.go

@@ -95,7 +95,7 @@ func (s *Server) EnableDiagnostic(ip string, port int) {
 	s.srv = srv
 	s.enable = 1
 	go func(n *Server) {
-		// Ingore ErrServerClosed that is returned on the Shutdown call
+		// Ignore ErrServerClosed that is returned on the Shutdown call
 		if err := srv.ListenAndServe(); err != nil && err != http.ErrServerClosed {
 			logrus.Errorf("ListenAndServe error: %s", err)
 			atomic.SwapInt32(&n.enable, 0)

+ 1 - 1
libnetwork/osl/interface_linux.go

@@ -297,7 +297,7 @@ func (n *networkNamespace) AddInterface(srcName, dstPrefix string, options ...If
 			logrus.Errorf("renaming interface (%s->%s) failed, %v after config error %v", i.DstName(), i.SrcName(), nerr, err)
 		}
 		if nerr := nlh.LinkSetNsFd(iface, ns.ParseHandlerInt()); nerr != nil {
-			logrus.Errorf("moving inteface %s to host ns failed, %v, after config error %v", i.SrcName(), nerr, err)
+			logrus.Errorf("moving interface %s to host ns failed, %v, after config error %v", i.SrcName(), nerr, err)
 		}
 		return err
 	}

+ 1 - 1
libnetwork/osl/namespace_linux.go

@@ -227,7 +227,7 @@ func NewSandbox(key string, osCreate, isRestore bool) (Sandbox, error) {
 		logrus.Warnf("Failed to set the timeout on the sandbox netlink handle sockets: %v", err)
 	}
 	// In live-restore mode, IPV6 entries are getting cleaned up due to below code
-	// We should retain IPV6 configrations in live-restore mode when Docker Daemon
+	// We should retain IPV6 configurations in live-restore mode when Docker Daemon
 	// comes back. It should work as it is on other cases
 	// As starting point, disable IPv6 on all interfaces
 	if !isRestore && !n.isDefault {

+ 4 - 4
libnetwork/test/integration/dnet/helpers.bash

@@ -332,7 +332,7 @@ function test_overlay() {
 
     start=1
     end=3
-    # Setup overlay network and connect containers ot it
+    # Setup overlay network and connect containers to it
     if [ -z "${2}" -o "${2}" != "skip_add" ]; then
 	if [ -z "${2}" -o "${2}" != "internal" ]; then
 	    dnet_cmd $(inst_id2port 1) network create -d overlay multihost
@@ -367,7 +367,7 @@ function test_overlay() {
 	done
     done
 
-    # Setup bridge network and connect containers ot it
+    # Setup bridge network and connect containers to it
     if [ -z "${2}" -o "${2}" != "skip_add" ]; then
 	if [ -z "${2}" -o "${2}" != "internal" ]; then
 	    dnet_cmd $(inst_id2port 1) network create -d bridge br1
@@ -445,7 +445,7 @@ function test_overlay_singlehost() {
 
     start=1
     end=3
-    # Setup overlay network and connect containers ot it
+    # Setup overlay network and connect containers to it
     dnet_cmd $(inst_id2port 1) network create -d overlay multihost
     for i in `seq ${start} ${end}`;
     do
@@ -484,7 +484,7 @@ function test_overlay_hostmode() {
 
     start=1
     end=2
-    # Setup overlay network and connect containers ot it
+    # Setup overlay network and connect containers to it
     dnet_cmd $(inst_id2port 1) network create -d overlay multihost1
     dnet_cmd $(inst_id2port 1) network create -d overlay multihost2
     dnet_cmd $(inst_id2port 1) network ls