Skip to content

Bump github.com/docker/go-units#12158

Merged
openshift-bot merged 1 commit intoopenshift:masterfrom
fabianofranz:issues_11967
Jan 14, 2017
Merged

Bump github.com/docker/go-units#12158
openshift-bot merged 1 commit intoopenshift:masterfrom
fabianofranz:issues_11967

Conversation

@fabianofranz
Copy link
Member

@fabianofranz fabianofranz commented Dec 6, 2016

Fixes #11967
Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1232251
Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1404571

Upstream bump: kubernetes/kubernetes#38130

Bump github.com/docker/go-units to include docker/go-units#22 which improves the precision of human durations ("about an hour ago", "2 days ago", etc).

@fabianofranz
Copy link
Member Author

[test]

@fabianofranz
Copy link
Member Author

@openshift/cli-review

@juanvallejo
Copy link
Contributor

LGTM

cc @liggitt

@ncdc
Copy link
Contributor

ncdc commented Dec 6, 2016

Post 1.5 rebase, if you don't mind?

@fabianofranz
Copy link
Member Author

Post 1.5 rebase, if you don't mind?

Sure, no problem. ;)

@fabianofranz
Copy link
Member Author

[merge]

@ncdc
Copy link
Contributor

ncdc commented Jan 13, 2017

--- FAIL: TestServiceRegistryExternalTrafficBetaAnnotationHealthCheckNodePortUserAllocation (0.00s)
	rest_test.go:1012: Unexpected failure creating service Internal error occurred: Failed to allocate requested HealthCheck nodePort 30200: provided port is already allocated
panic: interface conversion: interface is nil, not *api.Service [recovered]
	panic: interface conversion: interface is nil, not *api.Service
goroutine 105 [running]:
panic(0x16cb320, 0xc42034cc40)
	/usr/local/go/src/runtime/panic.go:500 +0x1ae
testing.tRunner.func1(0xc4205792c0)
	/usr/local/go/src/testing/testing.go:579 +0x474
panic(0x16cb320, 0xc42034cc40)
	/usr/local/go/src/runtime/panic.go:458 +0x271
github.com/openshift/origin/vendor/k8s.io/kubernetes/pkg/registry/core/service.TestServiceRegistryExternalTrafficBetaAnnotationHealthCheckNodePortUserAllocation(0xc4205792c0)
	/go/src/github.com/openshift/origin/_output/local/go/src/github.com/openshift/origin/vendor/k8s.io/kubernetes/pkg/registry/core/service/rest_test.go:1014 +0x58c
testing.tRunner(0xc4205792c0, 0x1988650)
	/usr/local/go/src/testing/testing.go:610 +0xca
created by testing.(*T).Run
	/usr/local/go/src/testing/testing.go:646 +0x530

@openshift-bot
Copy link
Contributor

Evaluated for origin test up to 3fca1ac

@openshift-bot
Copy link
Contributor

Evaluated for origin merge up to 3fca1ac

@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/test SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/12853/) (Base Commit: 398ca1a)

@openshift-bot
Copy link
Contributor

openshift-bot commented Jan 14, 2017

continuous-integration/openshift-jenkins/merge SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/12876/) (Base Commit: b16b328) (Image: devenv-rhel7_5678)

@openshift-bot openshift-bot merged commit 13074d4 into openshift:master Jan 14, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants