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

Merge back from containous/oxy #79

Closed
emilevauge opened this issue Jun 22, 2017 · 5 comments
Closed

Merge back from containous/oxy #79

emilevauge opened this issue Jun 22, 2017 · 5 comments
Labels

Comments

@emilevauge
Copy link
Contributor

Hey folks!

As you know, we forked oxy a while back as we needed to merge fixes quickly in Traefik. We think it's time to merge back from our fork and we want to open the discussion on the process we can use to achieve this.
We have a bit more than 10 commits to merge back: https://github.com/containous/oxy/tree/clean-history
Would you prefer a big pull request containing all our modifications or multiple PRs for each change?

Thanks for your feedback :)

/cc @ldez

@klingtnet
Copy link
Contributor

klingtnet commented Jul 3, 2017

@emilevauge Is the dependency to logrus removed in your fork? I am asking because I want to disable logging for oxy. Unfortunately, there is no easy way to do it because my application also uses logrus and I can only disable logging for the whole application and not on a package level.
#83

@klizhentas
Copy link
Contributor

@emilevauge send one big PR and will merge it

@emilevauge
Copy link
Contributor Author

Hey there :)
OK it took some time, but we are now ready to merge back from our fork. We discussed on how to proceed, and we will finally push 4 or 5 thematic PRs.
/cc @juliens

@ldez
Copy link
Member

ldez commented Nov 19, 2017

Hello Oxy team 😃 !

We (the Containous/Traefik team) would like to share with you more directly than through GitHub issues.
For this we would invite you to come on our Slack, we have create a dedicated private channel.
Ping me so I could add you in the channel.

@klizhentas @archisgore

@emilevauge
Copy link
Contributor Author

This job is finally complete, we can now close this one :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

No branches or pull requests

4 participants