Skip to content

Commit

Permalink
Merge branch 'main' into rum-disk-buffer
Browse files Browse the repository at this point in the history
  • Loading branch information
breedx-splk authored Oct 18, 2023
2 parents 481bc57 + 94c6b64 commit bbe11ab
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#### Enhancements

- Require a CLA Assistant GitHub workflow. (#269)
- Update the CLA notice in `CONTRIBUTING.md` template. (#269)
- Update the CLA notice in `CONTRIBUTING.md` template. (#269, #274)
- Add Renovate as an acceptable alternative to Dependabot. (#271)
- Add disk buffering configuration options for RUM (#275)

Expand Down
2 changes: 1 addition & 1 deletion specification/templates/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ GitHub provides additional documentation on [forking a
repository](https://help.github.com/articles/fork-a-repo/) and [creating a pull
request](https://help.github.com/articles/creating-a-pull-request/).

You may be asked to sign our
Before your contribution can be accepted, you will be asked to sign our
[Splunk Contributor License Agreement (CLA)](https://github.com/splunk/cla-agreement/blob/main/CLA.md).

## Finding contributions to work on
Expand Down

0 comments on commit bbe11ab

Please sign in to comment.