Merge pull request #11607 from miaoyq/remove-a-reduntand-variable

OpenShift Bot · web-flow · commit 0403599cd36c · 2016-10-27T14:52:48.000-04:00
Merged by openshift-bot
diff --git a/pkg/image/controller/controller.go b/pkg/image/controller/controller.go
@@ -101,9 +101,6 @@ func resetScheduledTags(stream *api.ImageStream) {
 	}
 }
 
-// retryCount is the number of times to retry on a conflict when updating an image stream
-const retryCount = 2
-
 // Next processes the given image stream, looking for streams that have DockerImageRepository
 // set but have not yet been marked as "ready". If transient errors occur, err is returned but
 // the image stream is not modified (so it will be tried again later). If a permanent

Original file line number	Diff line number	Diff line change
`@@ -101,9 +101,6 @@ func resetScheduledTags(stream *api.ImageStream) {`
`101`	`101`	`}`
`102`	`102`	`}`
`103`	`103`
`104`		`-// retryCount is the number of times to retry on a conflict when updating an image stream`
`105`		`-const retryCount = 2`
`106`		`-`
`107`	`104`	`// Next processes the given image stream, looking for streams that have DockerImageRepository`
`108`	`105`	`// set but have not yet been marked as "ready". If transient errors occur, err is returned but`
`109`	`106`	`// the image stream is not modified (so it will be tried again later). If a permanent`