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.

Sign up for GitHub

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

Jump to bottom

Allow merge() to work with one series and to take a list of time series #1047

Merged
merged 6 commits into from
Oct 23, 2014
Merged

Allow merge() to work with one series and to take a list of time series #1047

merged 6 commits into from
Oct 23, 2014

Conversation

jvshahid
Copy link
Contributor

No description provided.

@jvshahid jvshahid self-assigned this Oct 21, 2014
@jvshahid jvshahid added bug and removed 2 - Working labels Oct 21, 2014
@jvshahid
Copy link
Contributor Author

Stacktrace is available here #72 (comment). This stacktrace is caused by the fact that GetQueryString() expect the merge to always to have two series, but in this case there were one series that matches the regex.

This issue will automatically fix the bug since merge() can take a list of series which includes one series and all functions have to work with any number of series including 1

@jvshahid jvshahid changed the title Merge with regex will fail if the regex doesn't match any series Allow merge() to work with one series and to take a list of time series Oct 22, 2014
@jvshahid jvshahid added feature and removed bug labels Oct 22, 2014
@jvshahid
Copy link
Contributor Author

/cc @dgnorton @toddboom can you guys take a peek at this pr before i merge it in

@dgnorton
Copy link
Contributor

@jvshahid looks good

jvshahid added a commit that referenced this pull request Oct 23, 2014
@jvshahid
Merge pull request #1047 from influxdb/fix-1047
5f3b784 
Allow merge() to work with one series and to take a list of time series
@jvshahid jvshahid merged commit 5f3b784 into master Oct 23, 2014
@jvshahid jvshahid removed the review label Oct 23, 2014
@jvshahid jvshahid deleted the fix-1047 branch October 23, 2014 16:32
@jvshahid jvshahid removed their assignment Feb 24, 2015
@benbjohnson benbjohnson mentioned this pull request Feb 17, 2017
Closed
3 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@jvshahid @dgnorton