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

Merge upstream updates #126

Merged
merged 11 commits into from
Sep 26, 2022
Merged

Merge upstream updates #126

merged 11 commits into from
Sep 26, 2022

Conversation

npazosmendez
Copy link

Use Merge commit

carrieedwards and others added 11 commits September 22, 2022 11:00
@carrieedwards
Add check for number of arguments at the beginning of functions
9eb4592
@carrieedwards
Fix aggregateWithWildcards
4b7f424
@carrieedwards
Fix comment
429b9a4
@msaf1980
Fix seriesList with incomplete arguments (#710)
d79238f 
fix seriesList with incomplete arguments
@npazosmendez @msaf1980
perSecond: fix panic on empty series
a1a96fb
@npazosmendez @msaf1980
nonNegativeDerivative: fix panic on empty series
15660b6
@msaf1980
Merge pull request #713 from go-graphite/njpm/fix-panics
8c9f904 
Fix panics in perSecond and nonNegativeDerivative
@carrieedwards @msaf1980
Use CopyLink instead of modifying input
f76e45e
@msaf1980
Merge pull request #711 from go-graphite/cedwards/fix-functions-modif…
93d7df0 
…ying-input

Update functions that were modifying original input
@Civil
Merge branch 'main' into cedwards/fix-argument-handling
9e1fe34
@Civil
Merge pull request #712 from go-graphite/cedwards/fix-argument-handling
1982a9f 
Handle default arguments and number of arguments to avoid errors
@CLAassistant
Copy link

CLA assistant check
Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
2 out of 4 committers have signed the CLA.

✅ carrieedwards
✅ npazosmendez
❌ msaf1980
❌ Civil
You have signed the CLA already but the status is still pending? Let us recheck it.

carrieedwards
carrieedwards approved these changes Sep 26, 2022
View reviewed changes
Copy link
Collaborator

@carrieedwards carrieedwards left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@npazosmendez npazosmendez merged commit 6e1e28f into grafana:main Sep 26, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@carrieedwards carrieedwards carrieedwards approved these changes

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
5 participants
@npazosmendez @CLAassistant @carrieedwards @msaf1980 @Civil