Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bump to v1.2.0 #8072

Merged
merged 3 commits into from
Mar 17, 2016
Merged

bump to v1.2.0 #8072

merged 3 commits into from
Mar 17, 2016

Conversation

liggitt
Copy link
Contributor

@liggitt liggitt commented Mar 16, 2016

bumps to openshift/kubernetes@4a3f9c5

this level is based on https://github.com/kubernetes/kubernetes/releases/tag/v1.2.0

it includes previous UPSTREAM commits and carries
it additionally includes all UPSTREAM commits between b1d271f and 72686b6

this PR includes a bump of cadvisor to 0.22.2

@liggitt
Copy link
Contributor Author

liggitt commented Mar 16, 2016

[test]

@liggitt liggitt changed the title WIP - rebase onto v1.2.0 WIP - bump to v1.2.0 Mar 16, 2016
@liggitt liggitt changed the title WIP - bump to v1.2.0 bump to v1.2.0 Mar 17, 2016
@smarterclayton
Copy link
Contributor

Lgtm merge at will

@liggitt
Copy link
Contributor Author

liggitt commented Mar 17, 2016

@liggitt
Copy link
Contributor Author

liggitt commented Mar 17, 2016

50% passing at https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/2231/
5 seconds waiting for failing-dc-1
Re[test]

@deads2k
Copy link
Contributor

deads2k commented Mar 17, 2016

[merge]

@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/merge SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/2252/) (Image: devenv-rhel7_3758)

@openshift-bot
Copy link
Contributor

Evaluated for origin merge up to 4d025a8

@liggitt
Copy link
Contributor Author

liggitt commented Mar 17, 2016

50% passing with https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/2237/

[INFO] Starting build from /tmp/openshift/test-end-to-end-docker//artifacts/stiAppConfig.json and streaming its logs...
[INFO] Waiting for test namespace build to start
[INFO] Waiting for command to finish: 'oc get -n test builds | grep -i running'...
ruby-sample-build-1   Source    Git       Failed              
[FAIL] Returning early. Command Failed 'oc get -n test builds | grep -i running'

origin logs:

E0317 13:39:00.108147   20416 manager.go:1953] Error running pod "ruby-sample-build-1-build_test(98336527-ec45-11e5-ab56-0e373b6add15)" container "sti-build": runContainer: API error (500): Cannot start container d097c0990f176d0fc22e0a50fd7f3b0918e09652866cdc1a74f8492fac01a033: [8] System error: open /sys/fs/cgroup/cpu,cpuacct/system.slice/docker-d097c0990f176d0fc22e0a50fd7f3b0918e09652866cdc1a74f8492fac01a033.scope/cpu.shares: no such file or directory

#7616
[test]

@openshift-bot
Copy link
Contributor

Evaluated for origin test up to 4d025a8

@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/test SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/2252/)

openshift-bot pushed a commit that referenced this pull request Mar 17, 2016
@openshift-bot openshift-bot merged commit 1bdfe42 into openshift:master Mar 17, 2016
@liggitt liggitt deleted the rebase-20160316 branch March 18, 2016 17:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants