Accept tzinfo not only 2.x but also 1.x #2673
Merged
+1
−1
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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