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

Backport of 868a8b4f to 0.9.x - Optionally specify fixed 'now' to fetch #80

Merged
merged 3 commits into from
Jun 24, 2014

Conversation

steve-dave
Copy link
Member

This backport is required for the 0.9.x branch of graphite-web to be compatible with the 0.9.x branch of carbon.

@steve-dave
Copy link
Member Author

This fixes graphite-project/graphite-web#597

@steve-dave
Copy link
Member Author

@esc this PR actually fixes the issue of the 0.9.x branch of graphite-web requiring the master branch of whisper that you just mentioned in graphite-project/graphite-web#677 .

@steve-dave
Copy link
Member Author

@obfuscurity are you able to take care of merging this please? I see you merged this same change into master so would probably be the best one to do it.

@esc
Copy link
Contributor

esc commented Jun 23, 2014

@steve-dave I can also handle merging. Is it possible to add some tests here?

@steve-dave
Copy link
Member Author

@esc I can look into a test tomorrow but keep in mind it's a clean cherry-pick of a commit that's already in master. I tagged @obfuscurity as they merged the original commit into whisper/master and the PR on graphite-web/0.9.x graphite-project/graphite-web#523 that requires it so figured they would know more about it than you or I.

SEJeff added a commit that referenced this pull request Jun 24, 2014
Backport of 868a8b4 to 0.9.x - Optionally specify fixed 'now' to fetch
@SEJeff SEJeff merged commit fc62d4d into graphite-project:0.9.x Jun 24, 2014
@SEJeff
Copy link
Member

SEJeff commented Jun 24, 2014

Thanks @steve-dave, I'll be looking through your PRs and trying to merge what I'm able to tonight. We (graphite maintainers who don't have a lot of free time) really appreciated the work you've put in to make graphite better.

@steve-dave
Copy link
Member Author

@SEJeff thanks for finding the time, I really appreciate it!

@steve-dave steve-dave deleted the 0.9.x-fetchnow branch June 24, 2014 04:31
@esc
Copy link
Contributor

esc commented Jun 24, 2014

@steve-dave test will still be appreciated, if you find the time. 😄

@esc
Copy link
Contributor

esc commented Jun 24, 2014

Does this mean, we can release a new whisper from 0.9.x alongside the 0.9.x graphite-web release?

@steve-dave
Copy link
Member Author

@esc I believe we could, and perhaps should, have a release of all of carbon, whisper and graphite-web together... unless that was a rhetorical question?

Also, yes, I still have testing this on my list.

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.

3 participants