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

Cherry-picking commits from main to 1.x branch for 1.2 release #142

Merged
merged 3 commits into from
Nov 5, 2021
Merged

Cherry-picking commits from main to 1.x branch for 1.2 release #142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b857011
Fixes flaky test and removes local publishing of plugin dependencies …
downsrob Oct 20, 2021
607ffe7
Update copyright notice (#140)
qreshi Nov 2, 2021
6cbb687
Added 1.2 release notes. (#141)
AWSHurneyt Nov 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 0 additions & 20 deletions .github/workflows/cypress-workflow.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,26 +24,6 @@ jobs:
with:
# TODO: Parse this from alerting plugin
java-version: 14
# dependencies: OpenSearch
- name: Checkout OpenSearch
uses: actions/checkout@v2
with:
repository: opensearch-project/OpenSearch
path: OpenSearch
ref: '1.x'
- name: Build OpenSearch
working-directory: ./OpenSearch
run: ./gradlew publishToMavenLocal
# dependencies: common-utils
- name: Checkout common-utils
uses: actions/checkout@v2
with:
repository: opensearch-project/common-utils
path: common-utils
ref: 'main'
- name: Build common-utils
working-directory: ./common-utils
run: ./gradlew publishToMavenLocal -Dopensearch.version=${{ env.OPENSEARCH_VERSION }}
- name: Checkout
uses: actions/checkout@v2
with:
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,4 +48,4 @@ This project is licensed under the [Apache v2.0 License](LICENSE).

## Copyright

Copyright 2020-2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
Copyright OpenSearch Contributors. See [NOTICE](NOTICE.txt) for details.
1 change: 1 addition & 0 deletions cypress/integration/bucket_level_monitor_spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,7 @@ describe('Bucket-Level Monitors', () => {
cy.get('[data-test-subj="extractionQueryCodeEditor"]').within(() => {
// If possible, a data-test-subj attribute should be added to access the code editor input directly
cy.get('.ace_text-input')
.focus()
.clear({ force: true })
.type(JSON.stringify(sampleAggregationQuery), {
force: true,
Expand Down
11 changes: 11 additions & 0 deletions release-notes/opensearch-alerting-dashboards-plugin.release-notes-1.2.0.0.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
## Version 1.2.0.0 2021-11-04

Compatible with OpenSearch Dashboards 1.2.0

### Maintenance
* Bumps version to 1.2 ([#128](https://github.com/opensearch-project/alerting-dashboards-plugin/pull/128))
* Added 1.2 release notes. ([#141](https://github.com/opensearch-project/alerting-dashboards-plugin/pull/141))

### Bug Fixes
* Fixes flaky test and removes local publishing of plugin dependencies ([#135](https://github.com/opensearch-project/alerting-dashboards-plugin/pull/135))
* Update copyright notice ([#140](https://github.com/opensearch-project/alerting-dashboards-plugin/pull/140))