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.

Sign up for GitHub

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

Jump to bottom

Add protobuf to our types #9793

Merged
merged 8 commits into from
Jul 19, 2016
Merged

Add protobuf to our types #9793

merged 8 commits into from
Jul 19, 2016

Conversation

smarterclayton
Copy link
Contributor

[test]

@smarterclayton smarterclayton force-pushed the protobuf branch 2 times, most recently from 9714ab1 to 9af01eb Compare July 12, 2016 17:04
@smarterclayton
Copy link
Contributor Author

@liggitt made a few fixes on 26044 (that are already in the upstream PR). I think this should pass - it doesn't actually turn proto on, but ensures we generate and run with it compiled. PTAL

@liggitt liggitt self-assigned this Jul 12, 2016
@liggitt
Copy link
Contributor

liggitt commented Jul 12, 2016

what version is bump(k8s.io/kubernetes/third_party/protobuf) bumping to? why isn't that reflected in godeps?

@smarterclayton
Copy link
Contributor Author

it's covered by hack/copy-kube-artifacts, i'll add it to godeps

On Tue, Jul 12, 2016 at 4:25 PM, OpenShift Bot [email protected]
wrote:

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

—
You are receiving this because you authored the thread.
Reply to this email directly, view it on GitHub
#9793 (comment),
or mute the thread
https://github.com/notifications/unsubscribe/ABG_p7N-l9uSZmiomz4TqgYvxWtTk8hbks5qU_hQgaJpZM4JKAKL
.

@smarterclayton
Copy link
Contributor Author

Rebased and fixed godep.

@smarterclayton smarterclayton force-pushed the protobuf branch 4 times, most recently from 0919ec2 to 38bfc45 Compare July 15, 2016 04:30
@openshift-bot openshift-bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 18, 2016
@smarterclayton
Copy link
Contributor Author

Pretty sure this is a flake https://ci.openshift.redhat.com/jenkins/job/test_pull_requests_origin_check/3467/consoleFull#205171772656c25df4e4b05b79524e5d52 on secret races:

hack/test-cmd.sh has failed: quota.sh:25: executing 'oc describe appliedclusterresourcequota/for-deads-by-annotation -n bar --as deads' expecting any result and text 'secrets.*18'; re-trying every 0.2s until completion or 60.000s

Never observes 18.

@smarterclayton
Copy link
Contributor Author

@liggitt can you do a review?

@smarterclayton
Copy link
Contributor Author

[test]

@openshift-bot openshift-bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 18, 2016
@smarterclayton
Copy link
Contributor Author

I'm going to merge this so the second part can make progress. Add reviews afterwards as necessary. [merge]

@openshift-bot
Copy link
Contributor

openshift-bot commented Jul 18, 2016 •
edited
Loading

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

@smarterclayton
Copy link
Contributor Author

[test]

@openshift-bot
Copy link
Contributor

Evaluated for origin merge up to a230c74

@openshift-bot
Copy link
Contributor

Evaluated for origin test up to a230c74

@openshift-bot
Copy link
Contributor

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

@openshift-bot openshift-bot merged commit 18d1aa5 into openshift:master Jul 19, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@liggitt liggitt

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@smarterclayton @liggitt @openshift-bot