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

Cherry-picking upstream commits prior to the next rebase #1527

Merged
merged 4 commits into from
Apr 1, 2015

Conversation

abhgupta
Copy link
Member

No description provided.

@smarterclayton
Copy link
Contributor

LGTM [merge]

@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/merge SUCCESS (https://ci.openshift.redhat.com/jenkins/job/merge_pull_requests_openshift3/1375/) (Image: devenv-fedora_1183)

@openshift-bot
Copy link
Contributor

[Test]ing while waiting on the merge queue

@openshift-bot
Copy link
Contributor

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

@abhgupta
Copy link
Member Author

re[test] - seems like a transient failure

@abhgupta
Copy link
Member Author

abhgupta commented Apr 1, 2015

[merge] failed on a seemingly transient error (TestSimpleImageChangeTriggerFrom), retrying one last time...

@openshift-bot
Copy link
Contributor

Evaluated for origin up to a2abd25

openshift-bot pushed a commit that referenced this pull request Apr 1, 2015
@openshift-bot openshift-bot merged commit 862caa7 into openshift:master Apr 1, 2015
jboyd01 pushed a commit to jboyd01/origin that referenced this pull request Nov 3, 2017
…service-catalog/' changes from 892b0368f0..3064247d05

3064247d05 origin build: add origin tooling
48ecff1 Chart changes for 0.1.2 (openshift#1527)
8727247 Fix change validator to look up serviceclass properly (openshift#1518)
b0b138b Broker Reconciliation occurs too frequently (openshift#1514)
cc816eb When a SI is unbindable, mark the binding request failed. (openshift#1522)
41290e9 Clarify semantics around RelistDuration (openshift#1516)
6bcb593 Send Context with UpdateInstanceRequest (openshift#1517)
c3b72d8 Enforce stricly increasing broker relistRequests (openshift#1515)
01d81e5 Follow up from openshift#1450 and openshift#1444 (openshift#1504)
5e77882 Retry failed deprovision requests (openshift#1505)
f6c891d Allow updates of instances that failed a previous update. (openshift#1502)
5107086 Use Plan ID from ExternalProperties when deprovisioning instance (openshift#1501)
d897c60 Adding message builder for expected event strings  (openshift#1465)
9f6152e update osb client and freeze gorilla context (openshift#1496)
c63277e Add unit tests verifying deleting a resource with an on-going operation or in orphan mitigation. (openshift#1490)
4ecca16 Pretty logging for controller_instance.go (openshift#1472)
c232db4 Register qemu statics when building non-amd64 images (openshift#1494)
0e54c57 fix 'Spring Cloud Services -> Configuring with Vault' link in docs (openshift#1495)
REVERT: 892b0368f0 origin build: add origin tooling

git-subtree-dir: cmd/service-catalog/go/src/github.com/kubernetes-incubator/service-catalog
git-subtree-split: 3064247d0544aa43f976d93caea0a11771434ef7
jpeeler pushed a commit to jpeeler/origin that referenced this pull request Feb 1, 2018
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.

3 participants