diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index ab40d21d..4f130e35 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -3,4 +3,26 @@ *Description of changes:* -By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license. +By making a contribution to this project, I certify that: + +(a) The contribution was created in whole or in part by me and I + have the right to submit it under the open source license + indicated in the file; or + +(b) The contribution is based upon previous work that, to the best + of my knowledge, is covered under an appropriate open source + license and I have the right under that license to submit that + work with modifications, whether created in whole or in part + by me, under the same open source license (unless I am + permitted to submit under a different license), as indicated + in the file; or + +(c) The contribution was provided directly to me by some other + person who certified (a), (b) or (c) and I have not modified + it. + +(d) I understand and agree that this project and the contribution + are public and that a record of the contribution (including all + personal information I submit with it, including my sign-off) is + maintained indefinitely and may be redistributed consistent with + this project or the open source license(s) involved. diff --git a/.github/workflows/draft-release-notes-workflow.yml b/.github/workflows/draft-release-notes-workflow.yml index f4543fd3..5e67f9a5 100644 --- a/.github/workflows/draft-release-notes-workflow.yml +++ b/.github/workflows/draft-release-notes-workflow.yml @@ -3,7 +3,7 @@ name: Release Drafter on: push: branches: - - master + - main jobs: update_release_draft: diff --git a/.github/workflows/multi-node-test-workflow.yml b/.github/workflows/multi-node-test-workflow.yml index f80a7686..29d7b622 100644 --- a/.github/workflows/multi-node-test-workflow.yml +++ b/.github/workflows/multi-node-test-workflow.yml @@ -1,12 +1,12 @@ name: Multi node test workflow -# This workflow is triggered on pull requests to master +# This workflow is triggered on pull requests to main on: pull_request: branches: - - master + - main push: branches: - - master + - main jobs: build: diff --git a/.github/workflows/release-workflow.yml b/.github/workflows/release-workflow.yml index 4b649efe..f29d78b6 100644 --- a/.github/workflows/release-workflow.yml +++ b/.github/workflows/release-workflow.yml @@ -1,5 +1,5 @@ name: Release workflow -# This workflow is triggered on creating tags to master or a opendistro release branch +# This workflow is triggered on creating tags to main or a opendistro release branch on: push: tags: diff --git a/.github/workflows/test-workflow.yml b/.github/workflows/test-workflow.yml index 5a278f7b..2da8711e 100644 --- a/.github/workflows/test-workflow.yml +++ b/.github/workflows/test-workflow.yml @@ -1,13 +1,13 @@ name: Test Workflow -# This workflow is triggered on pull requests and pushes to master or an opendistro release branch +# This workflow is triggered on pull requests and pushes to main or an opendistro release branch on: pull_request: branches: - - master + - main - opendistro-* push: branches: - - master + - main - opendistro-* jobs: diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index df6a5c45..598b2f55 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -23,7 +23,7 @@ reported the issue. Please try to include as much information as you can. Detail ## Contributing via Pull Requests Contributions via pull requests are much appreciated. Before sending us a pull request, please ensure that: -1. You are working against the latest source on the *master* branch. +1. You are working against the latest source on the *main* branch. 2. You check existing open, and recently merged, pull requests to make sure someone else hasn't addressed the problem already. 3. You open an issue to discuss any significant work - we would hate for your time to be wasted. diff --git a/README.md b/README.md index e7450e46..eb7ad89b 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ [![Test Workflow](https://github.com/opendistro-for-elasticsearch/alerting/workflows/Test%20Workflow/badge.svg)](https://github.com/opendistro-for-elasticsearch/alerting/actions) -[![codecov](https://codecov.io/gh/opendistro-for-elasticsearch/alerting/branch/master/graph/badge.svg)](https://codecov.io/gh/opendistro-for-elasticsearch/alerting) +[![codecov](https://codecov.io/gh/opendistro-for-elasticsearch/alerting/branch/main/graph/badge.svg)](https://codecov.io/gh/opendistro-for-elasticsearch/alerting) [![Documentation](https://img.shields.io/badge/api-reference-blue.svg)](https://opendistro.github.io/for-elasticsearch-docs/docs/alerting/api/) [![Chat](https://img.shields.io/badge/chat-on%20forums-blue)](https://discuss.opendistrocommunity.dev/c/alerting/) ![PRs welcome!](https://img.shields.io/badge/PRs-welcome!-success) @@ -43,7 +43,7 @@ This package is organized into subprojects, most of which contribute JARs to the All subprojects in this package use the [Gradle](https://docs.gradle.org/current/userguide/userguide.html) build system. Gradle comes with excellent documentation that should be your first stop when trying to figure out how to operate or modify the build. -However, to build the `alerting` plugin subproject, we also use the Elastic build tools for Gradle. These tools are idiosyncratic and don't always follow the conventions and instructions for building regular Java code using Gradle. Not everything in `alerting` will work the way it's described in the Gradle documentation. If you encounter such a situation, the Elastic build tools [source code](https://github.com/elastic/elasticsearch/tree/master/buildSrc/src/main/groovy/org/elasticsearch/gradle) is your best bet for figuring out what's going on. +However, to build the `alerting` plugin subproject, we also use the Elastic build tools for Gradle. These tools are idiosyncratic and don't always follow the conventions and instructions for building regular Java code using Gradle. Not everything in `alerting` will work the way it's described in the Gradle documentation. If you encounter such a situation, the Elastic build tools [source code](https://github.com/elastic/elasticsearch/tree/main/buildSrc/src/main/groovy/org/elasticsearch/gradle) is your best bet for figuring out what's going on. ### Building from the command line