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

cluster up: fix Windows config file upload #12634

Merged
merged 1 commit into from
Jan 24, 2017

Conversation

csrwng
Copy link
Contributor

@csrwng csrwng commented Jan 24, 2017

Uses the path (unix-style) package instead of filepath (platform-specific)
for setting the config file upload path to the origin container.

Uses the path (unix-style) package instead of filepath (platform-specific)
for creating the config file upload path for the origin container.
@csrwng
Copy link
Contributor Author

csrwng commented Jan 24, 2017

@smarterclayton this is a pull to the 1.4 branch

@smarterclayton
Copy link
Contributor

Thanks [merge]

@openshift-bot
Copy link
Contributor

[Test]ing while waiting on the merge queue

@openshift-bot
Copy link
Contributor

Evaluated for origin test up to dd1a028

@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/test FAILURE (https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/13219/) (Base Commit: ff3dbfc)

@smarterclayton
Copy link
Contributor

[merge]

@csrwng
Copy link
Contributor Author

csrwng commented Jan 24, 2017

#12362
[merge]

@openshift-bot
Copy link
Contributor

openshift-bot commented Jan 24, 2017

continuous-integration/openshift-jenkins/merge Waiting: You are in the build queue at position: 2

@csrwng
Copy link
Contributor Author

csrwng commented Jan 24, 2017

really?

github.com/openshift/origin/test/cmd/idle/by-label.test/cmd/idle.sh:34: executing 'oc get pod -l app=idling-echo -o go-template='{{ len .items }}'' expecting any result and text '2'; re-trying every 0.2s until completion or 60.000s

[merge]

@openshift-bot
Copy link
Contributor

Evaluated for origin merge up to dd1a028

@smarterclayton smarterclayton merged commit 3f9807a into openshift:release-1.4 Jan 24, 2017
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