whisper: upgrade to the same version as the other graphite components #21032
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Without this we get the following Python exception when trying to fetch
a graph in the graphite web app:
File "/nix/store/nj62jqk2xmp5c3h93pfnlqn66qj1kkvs-python-2.7.12-env/lib/python2.7/site-packages/opt/graphite/webapp/graphite/storage.py", line 335, in fetch
return whisper.fetch(self.fs_path, startTime, endTime, now)
TypeError: fetch() takes at most 3 arguments (4 given)
|
@basvandijk, thanks for your PR! By analyzing the history of the files in this pull request, we identified @FRidh to be a potential reviewer. |
|
@domenkozar @fpletz it would be great if this could be merged in |
|
The target of this fix should be master instead of the release branch. |
fpletz
pushed a commit
that referenced
this pull request
Dec 15, 2016
Without this we get the following Python exception when trying to fetch
a graph in the graphite web app:
File "/nix/store/nj62jqk2xmp5c3h93pfnlqn66qj1kkvs-python-2.7.12-env/lib/python2.7/site-packages/opt/graphite/webapp/graphite/storage.py", line 335, in fetch
return whisper.fetch(self.fs_path, startTime, endTime, now)
TypeError: fetch() takes at most 3 arguments (4 given)
Fixes #21032.
(cherry picked from commit b4005bb)
|
Cherry-picked your commit to master and then to release-16.09. Thanks! |
|
Thank you! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Without this patch (based on
release-16.09) we get the following Python exception when trying to fetch a graph in the graphite web app:@fpletz I also abstracted the graphite version behind a variable so this mistake won't happen again.
This probably also has to be cherry picked on
master.