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(github.com/openshift/openshift-sdn): 9f1f60258fcef6f0ef647a75a87 #8468

Merged
merged 1 commit into from
Apr 13, 2016

Conversation

@pravisankar
Copy link
Author

[test][extended:networking]

@openshift-bot
Copy link
Contributor

Evaluated for origin test up to 00d36b1

@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/test FAILURE (https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/2908/) (Extended Tests: networking)

@pravisankar
Copy link
Author

OOM Flake in Kubelet, Networking extended tests passed

@pravisankar pravisankar changed the title [DO_NOT_MERGE] bump(github.com/openshift/openshift-sdn): 9f1f60258fcef6f0ef647a75a87 bump(github.com/openshift/openshift-sdn): 9f1f60258fcef6f0ef647a75a87 Apr 12, 2016
@pravisankar
Copy link
Author

@eparis @knobunc can we get these fixes into origin?
We can bundle rest of the fixes in subsequent pr (sometime tomorrow or Thursday)

@eparis
Copy link
Member

eparis commented Apr 12, 2016

@danwinship @dcbw get a couple of reviews and I will merge.

@knobunc
Copy link
Contributor

knobunc commented Apr 12, 2016

The changes you pulled for issue 285 and issue 277 look good to me. The other changes I spot checked looked complete too... so yeah. LGTM

@danwinship
Copy link
Contributor

I thought we already agreed we weren't doing a full resync for 3.2? (#8333)

@eparis
Copy link
Member

eparis commented Apr 12, 2016

I think ravi is trying to argue that the number of bug fixes is so large and the non-required fixes so small/risk free....

But I'll let you tell me.

@pravisankar
Copy link
Author

If we plan to skip/cherry-pick commits, patches won't apply smoothly due to some refactors and also we need to maintain what is synced and what is not synced to origin.
At least I feel except openshift/openshift-sdn#271 all the commits either fixes some existing issue or helps in debugging our code.

@danwinship
Copy link
Contributor

At least I feel except openshift/openshift-sdn#271 all the commits either fixes some existing issue or helps in debugging our code.

agreed (although note that the debugging fixes are not actually part of this PR: debug.sh isn't synced to origin)

We probably should wait to get openshift/openshift-sdn#292 in too?

@pravisankar
Copy link
Author

On Tue, Apr 12, 2016 at 2:01 PM, Dan Winship [email protected]
wrote:

At least I feel except openshift/openshift-sdn#271
openshift/openshift-sdn#271 all the commits
either fixes some existing issue or helps in debugging our code.

agreed (although note that the debugging fixes are not actually part of
this PR: debug.sh isn't synced to origin)

We probably should wait to get openshift/openshift-sdn#292
openshift/openshift-sdn#292 in too?

We got some more pending fixes, we can bundle them in a separate pr


You are receiving this because you authored the thread.
Reply to this email directly or view it on GitHub
#8468 (comment)

@danwinship
Copy link
Contributor

LGTM

@eparis
Copy link
Member

eparis commented Apr 13, 2016

approved and [merge]

@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/merge SUCCESS (https://ci.openshift.redhat.com/jenkins/job/merge_pull_requests_origin/5584/) (Image: devenv-rhel7_3964)

@openshift-bot
Copy link
Contributor

Evaluated for origin merge up to 00d36b1

@openshift-bot openshift-bot merged commit 78e713c into openshift:master Apr 13, 2016
@dragon9783
Copy link

LGTM

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.

6 participants