Merge with master.

Joji Mekkatt · Joji Mekkatt · commit 41650e6218ee · 2016-01-31T12:02:14.000-08:00
diff --git a/netplugin/cluster/cluster.go b/netplugin/cluster/cluster.go
@@ -154,7 +154,7 @@ func peerDiscoveryLoop(netplugin *plugin.NetPlugin, objdbClient objdb.API, local
 		log.Fatalf("Could not start a watch on netmaster service. Err: %v", err)
 	}
 
-	// Start a watch on netplugin service so that we dont miss any
+	// Start a watch on netplugin service
 	err = objdbClient.WatchService("netplugin", nodeEventCh, watchStopCh)
 	if err != nil {
 		log.Fatalf("Could not start a watch on netplugin service. Err: %v", err)

Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,7 @@ func peerDiscoveryLoop(netplugin *plugin.NetPlugin, objdbClient objdb.API, local`
`154`	`154`	`log.Fatalf("Could not start a watch on netmaster service. Err: %v", err)`
`155`	`155`	`}`
`156`	`156`
`157`		`- // Start a watch on netplugin service so that we dont miss any`
	`157`	`+ // Start a watch on netplugin service`
`158`	`158`	`err = objdbClient.WatchService("netplugin", nodeEventCh, watchStopCh)`
`159`	`159`	`if err != nil {`
`160`	`160`	`log.Fatalf("Could not start a watch on netplugin service. Err: %v", err)`