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

Restore custom etcd prefix for user-identities #12606

Merged
merged 1 commit into from
Jan 24, 2017
Merged

Restore custom etcd prefix for user-identities #12606

merged 1 commit into from
Jan 24, 2017

Conversation

liggitt
Copy link
Contributor

@liggitt liggitt commented Jan 23, 2017 •
edited
Loading

The prefix was accidentally changed in during 1.4 development. This reverts to the 1.3 prefix.

Fixes #12598

Cherry-pick of #12607

@liggitt
Copy link
Contributor Author

liggitt commented Jan 23, 2017

[test]

@liggitt liggitt added this to the 1.4.0 milestone Jan 23, 2017
@liggitt liggitt mentioned this pull request Jan 23, 2017
Closed
@liggitt
Copy link
Contributor Author

liggitt commented Jan 23, 2017

@smarterclayton looks like 1.4 tests fail with /data/src/github.com/openshift/origin/hack/common.sh: line 6: OS_BUILD_ENV_GOLANG: readonly variable

@liggitt
Restore custom etcd prefixes
bd3fa46 
Fix identities to be stored under /useridentities
Fix egressnetworkpolicies to be stored under /registry/egressnetworkpolicy
@liggitt
Copy link
Contributor Author

liggitt commented Jan 23, 2017

@stevekuznetsov any idea why we're getting "/data/src/github.com/openshift/origin/hack/common.sh: line 6: OS_BUILD_ENV_GOLANG: readonly variable" errors in the 1.4 CI builds?

@stevekuznetsov
Copy link
Contributor

Not clear -- try rebasing on current master? hack/common.sh doesn't have that content at line 6 anymore.

@stevekuznetsov
Copy link
Contributor

Oh, this is a backport -- probably something whacky with an improper git history. I'll look.

@stevekuznetsov
Copy link
Contributor

@liggitt should be fixed

@openshift-bot
Copy link
Contributor

Evaluated for origin test up to bd3fa46

@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/test SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/13193/) (Base Commit: 208f053)

@smarterclayton
Copy link
Contributor

LGTM [merge]

@openshift-bot
Copy link
Contributor

openshift-bot commented Jan 23, 2017 •
edited
Loading

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

@openshift-bot
Copy link
Contributor

Evaluated for origin merge up to bd3fa46

@openshift-bot openshift-bot merged commit ff3dbfc into openshift:release-1.4 Jan 24, 2017
@john-deng
Copy link

@liggitt When will v1.4.1 be released?

@liggitt
Copy link
Contributor Author

liggitt commented Jan 24, 2017

https://github.com/openshift/origin/releases/tag/v1.4.1 is released

@stevekuznetsov stevekuznetsov mentioned this pull request Jan 25, 2017
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
1.4.0
Development

Successfully merging this pull request may close these issues.
5 participants
@liggitt @stevekuznetsov @openshift-bot @smarterclayton @john-deng