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

Accept tzinfo not only 2.x but also 1.x #2673

Merged
merged 1 commit into from
Oct 29, 2019

Conversation

ashie
Copy link
Member

@ashie ashie commented Oct 29, 2019

Which issue(s) this PR fixes:
Fixes #2634

What this PR does / why we need it:
The pull request #2479 enforces using tzinfo ~> 2.0 but it conflicts
with plugins which depend on activesupport such as fluent-plugin-sql
since it requires tzinfo ~> 1.1.
Until activesupport upgrades it, it would be better to accept also
tzinfo 1.x to keep availability of such plugins. Fluentd can accept
both versions of tzinfo since #2479 absorb the difference of their
API.

Docs Changes:
None

Release Note:
None

The pull request fluent#2479 enforces using tzinfo ~> 2.0 but it conflicts
with plugins which depend on activesupport such as fluent-plugin-sql
since it requires tzinfo ~> 1.1.
Until activesupport upgrades it, it would be better to accept also
tzinfo 1.x to keep availability of such plugins. Fluentd can accept
both versions of tzinfo since fluent#2479 absorb the difference of their
API.

Fix fluent#2634
See also fluent/fluent-plugin-sql#77

Signed-off-by: Takuro Ashie <[email protected]>
@repeatedly
Copy link
Member

Does fluentd with tzinfo v1.x passes all tests?
Current CI uses fluentd and tzinfo v2.

@ashie
Copy link
Member Author

ashie commented Oct 29, 2019

Yes, all tests passed with tzinfo v1.2.5

@repeatedly repeatedly merged commit 942da25 into fluent:master Oct 29, 2019
@repeatedly
Copy link
Member

Ok, Thanks!

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.

Need to downgrade tzinfo for fluent-pluigin that depends on ActiveSupport?
3 participants