k8s-merge-robot fc1937f68f Merge pull request #20273 from kargakis/allow-scaling-paused-deployments ... Automatic merge from submit-queue Proportionally scale paused and rolling deployments Enable paused and rolling deployments to be proportionally scaled. Also have cleanup policy work for paused deployments. Fixes #20853 Fixes #20966 Fixes #20754 @bgrant0607 @janetkuo @ironcladlou @nikhiljindal <!-- Reviewable:start --> --- This change is [<img src="http://reviewable.k8s.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](http://reviewable.k8s.io/reviews/kubernetes/kubernetes/20273) <!-- Reviewable:end -->		2016-06-24 19:41:51 -07:00
..
deployment_controller_test.go	Merge pull request #20273 from kargakis/allow-scaling-paused-deployments	2016-06-24 19:41:51 -07:00
deployment_controller.go	Merge pull request #20273 from kargakis/allow-scaling-paused-deployments	2016-06-24 19:41:51 -07:00
util.go	controller: proportionally scale paused and rolling deployments	2016-06-20 12:13:35 +02:00