Merge pull request #22577 from jpiccari/master

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2016-03-06 00:18:53 -08:00
5 changed files with 6 additions and 6 deletions

View File

@@ -428,7 +428,7 @@ func (dc *DeploymentController) syncDeployment(key string) error {
if d.Spec.Paused {
// 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.
// Ignore paused deployments
glog.V(4).Infof("Updating status only for paused deployment %s/%s", d.Namespace, d.Name)