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

Enable oss storage driver #12092

Merged

Conversation

legionus
Copy link
Contributor

@legionus legionus commented Dec 1, 2016

Fix #11995

@mfojtik @pweil- please review

@mfojtik
Copy link
Contributor

mfojtik commented Dec 1, 2016

[test]

@mfojtik mfojtik added this to the 1.4.0 milestone Dec 1, 2016
@mfojtik
Copy link
Contributor

mfojtik commented Dec 1, 2016

@legionus we will have to make a second PR for 1.4 branch IMHO

@legionus
Copy link
Contributor Author

legionus commented Dec 1, 2016

@mfojtik Let's merge this PR first.

@legionus legionus force-pushed the registry-add-oss-storage-driver branch from f00c95a to 2884b70 Compare December 1, 2016 14:53
@mfojtik
Copy link
Contributor

mfojtik commented Dec 1, 2016

@legionus I think you have change the commit message and split this to changing vendored dir commit and second that change the origin file. (to pass the commit checker)

other than this LGTM

Copy link

@pweil- pweil- left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please break into a bump commit and an origin commit. Everything else looks good to me

@legionus legionus force-pushed the registry-add-oss-storage-driver branch from 2884b70 to 3c24e0a Compare December 1, 2016 15:34
@pweil-
Copy link

pweil- commented Dec 1, 2016

re[test]

@mfojtik
Copy link
Contributor

mfojtik commented Dec 1, 2016

@legionus

vendor/github.com/docker/distribution/registry/storage/driver/oss/oss.go:28:2: cannot find package "github.com/denverdino/aliyungo/oss" in any of:

@legionus
Copy link
Contributor Author

legionus commented Dec 1, 2016

@mfojtik Damn. That's what happens when trying to do two PRs in same time.

Signed-off-by: Gladkov Alexey <[email protected]>
@legionus legionus force-pushed the registry-add-oss-storage-driver branch from 3c24e0a to cc8ab12 Compare December 2, 2016 10:58
@mfojtik
Copy link
Contributor

mfojtik commented Dec 2, 2016

@legionus are you working on this or should I go try to resolve the godep?

@legionus legionus force-pushed the registry-add-oss-storage-driver branch from cc8ab12 to 02d5805 Compare December 2, 2016 11:08
@legionus
Copy link
Contributor Author

legionus commented Dec 2, 2016

@mfojtik I've fixed it already.

@mfojtik
Copy link
Contributor

mfojtik commented Dec 2, 2016

thx. lets make the test pass and open 1.4 branch pr

@legionus
Copy link
Contributor Author

legionus commented Dec 2, 2016

[test]

@openshift-bot
Copy link
Contributor

Evaluated for origin test up to 02d5805

@soltysh
Copy link
Contributor

soltysh commented Dec 2, 2016

@ncdc heads up for Godeps changes

@soltysh
Copy link
Contributor

soltysh commented Dec 2, 2016

LGTM, including godep change

@mfojtik
Copy link
Contributor

mfojtik commented Dec 2, 2016

[merge]

flake: #12072

@openshift-bot
Copy link
Contributor

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

@pweil-
Copy link

pweil- commented Dec 2, 2016

@legionus @mfojtik do you have 1.4 branch patch for this?

Edit: found it...linking here

#12115

@soltysh
Copy link
Contributor

soltysh commented Dec 3, 2016

Flake #11004
[merge]

@soltysh
Copy link
Contributor

soltysh commented Dec 5, 2016

Flake: #10988, #11016

re-[merge]

@mfojtik
Copy link
Contributor

mfojtik commented Dec 5, 2016

yum repo flake [merge]

@openshift-bot
Copy link
Contributor

Evaluated for origin merge up to 02d5805

@openshift-bot
Copy link
Contributor

openshift-bot commented Dec 5, 2016

continuous-integration/openshift-jenkins/merge SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/12006/) (Base Commit: 0158f35) (Image: devenv-rhel7_5486)

@openshift-bot openshift-bot merged commit de44433 into openshift:master Dec 5, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants