scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-03 19:58:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #22577 from jpiccari/master

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2016-03-06 00:18:53 -08:00
parent c7a50206c0 f5f83b076a
commit 8ab8231c20
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/client/cache/expiration_cache.go vendored
View File

@@ -33,7 +33,7 @@ import (
// *any* item in the cache. // *any* item in the cache.
// 3. Time-stamps are stripped off unexpired entries before return // 3. Time-stamps are stripped off unexpired entries before return
// Note that the ExpirationCache is inherently slower than a normal // Note that the ExpirationCache is inherently slower than a normal
// threadSafeStore because it takes a write lock everytime it checks if // threadSafeStore because it takes a write lock every time it checks if
// an item has expired. // an item has expired.
type ExpirationCache struct { type ExpirationCache struct {
cacheStorage ThreadSafeStore cacheStorage ThreadSafeStore

2
pkg/controller/deployment/deployment_controller.go
View File

@@ -428,7 +428,7 @@ func (dc *DeploymentController) syncDeployment(key string) error {
if d.Spec.Paused { if d.Spec.Paused {
// TODO: Implement scaling for paused deployments. // TODO: Implement scaling for paused deployments.
// Dont take any action for paused deployment. // Don't take any action for paused deployment.
// But keep the status up-to-date. // But keep the status up-to-date.
// Ignore paused deployments // Ignore paused deployments
glog.V(4).Infof("Updating status only for paused deployment %s/%s", d.Namespace, d.Name) glog.V(4).Infof("Updating status only for paused deployment %s/%s", d.Namespace, d.Name)

2
pkg/kubelet/container_bridge.go
View File

@@ -98,7 +98,7 @@ func ensureCbr0(wantCIDR *net.IPNet, promiscuous, babysitDaemons bool) error {
// TODO: Remove this once the kernel bug (#20096) is fixed. // TODO: Remove this once the kernel bug (#20096) is fixed.
if promiscuous { if promiscuous {
// Checking if the bridge is in promiscuous mode is as expensive and more brittle than // Checking if the bridge is in promiscuous mode is as expensive and more brittle than
// simply setting the flag everytime. // simply setting the flag every time.
if err := exec.Command("ip", "link", "set", "cbr0", "promisc", "on").Run(); err != nil { if err := exec.Command("ip", "link", "set", "cbr0", "promisc", "on").Run(); err != nil {
glog.Error(err) glog.Error(err)
return err return err

4
pkg/util/labels/labels.go
View File

@@ -57,7 +57,7 @@ func CloneAndRemoveLabel(labels map[string]string, labelKey string) map[string]s
// AddLabel returns a map with the given key and value added to the given map. // AddLabel returns a map with the given key and value added to the given map.
func AddLabel(labels map[string]string, labelKey string, labelValue string) map[string]string { func AddLabel(labels map[string]string, labelKey string, labelValue string) map[string]string {
if labelKey == "" { if labelKey == "" {
// Dont need to add a label. // Don't need to add a label.
return labels return labels
} }
if labels == nil { if labels == nil {
@@ -110,7 +110,7 @@ func CloneSelectorAndAddLabel(selector *unversioned.LabelSelector, labelKey stri
// AddLabelToSelector returns a selector with the given key and value added to the given selector's MatchLabels. // AddLabelToSelector returns a selector with the given key and value added to the given selector's MatchLabels.
func AddLabelToSelector(selector *unversioned.LabelSelector, labelKey string, labelValue string) *unversioned.LabelSelector { func AddLabelToSelector(selector *unversioned.LabelSelector, labelKey string, labelValue string) *unversioned.LabelSelector {
if labelKey == "" { if labelKey == "" {
// Dont need to add a label. // Don't need to add a label.
return selector return selector
} }
if selector.MatchLabels == nil { if selector.MatchLabels == nil {

2
test/e2e/util.go
View File

@@ -2620,7 +2620,7 @@ func NodeAddresses(nodelist *api.NodeList, addrType api.NodeAddressType) []strin
return hosts return hosts
} }
// NodeSSHHosts returns SSH-able host names for all schedulable nodes - this exludes master node. // NodeSSHHosts returns SSH-able host names for all schedulable nodes - this excludes master node.
// It returns an error if it can't find an external IP for every node, though it still returns all // It returns an error if it can't find an external IP for every node, though it still returns all
// hosts that it found in that case. // hosts that it found in that case.
func NodeSSHHosts(c *client.Client) ([]string, error) { func NodeSSHHosts(c *client.Client) ([]string, error) {