Merge pull request #4663 from eparis/gofmt

check gofmt with golang 1.4
This commit is contained in:
Victor Marmol 2015-02-20 10:16:44 -08:00
commit 17b60e1d75
2 changed files with 3 additions and 2 deletions

View File

@ -24,7 +24,7 @@ KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
GO_VERSION=($(go version))
if [[ -z $(echo "${GO_VERSION[2]}" | grep -E 'go1.2|go1.3') ]]; then
if [[ -z $(echo "${GO_VERSION[2]}" | grep -E 'go1.2|go1.3|go1.4') ]]; then
echo "Unknown go version '${GO_VERSION}', skipping gofmt."
exit 0
fi

View File

@ -262,7 +262,8 @@ func (s *serviceStore) MergedState() interface{} {
// watchForUpdates invokes bcaster.Notify() with the latest version of an object
// when changes occur.
func watchForUpdates(bcaster *config.Broadcaster, accessor config.Accessor, updates <-chan struct{}) {
for _ = range updates {
for true {
<-updates
bcaster.Notify(accessor.MergedState())
}
}