Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/1.x' into 1.x
Browse files Browse the repository at this point in the history
  • Loading branch information
prudhvigodithi committed Sep 1, 2022
2 parents 41a090b + 7a0f31b commit 5490f15
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 7 deletions.
12 changes: 11 additions & 1 deletion charts/opensearch-dashboards/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Fixed
### Security
---
## [1.8.0]
### Added
- Updated OpenSearch Dashboard appVersion to 1.3.5.
### Changed
### Deprecated
### Removed
### Fixed
### Security
---
## [1.7.4]
### Added
- Add lifecycle hooks for opensearch-dashboards charts
Expand Down Expand Up @@ -270,7 +279,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Fixed
### Security

[Unreleased]: https://github.com/opensearch-project/helm-charts/compare/opensearch-dashboards-1.7.4...HEAD
[Unreleased]: https://github.com/opensearch-project/helm-charts/compare/opensearch-dashboards-1.8.0...HEAD
[1.8.0]: https://github.com/opensearch-project/helm-charts/compare/opensearch-1.7.4...opensearch-1.8.0
[1.7.4]: https://github.com/opensearch-project/helm-charts/compare/opensearch-1.7.3...opensearch-1.7.4
[1.7.3]: https://github.com/opensearch-project/helm-charts/compare/opensearch-1.7.2...opensearch-1.7.3
[1.7.2]: https://github.com/opensearch-project/helm-charts/compare/opensearch-1.7.1...opensearch-1.7.2
Expand Down
4 changes: 2 additions & 2 deletions charts/opensearch-dashboards/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 1.7.4
version: 1.8.0

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
# It is recommended to use it with quotes.
appVersion: "1.3.4"
appVersion: "1.3.5"

maintainers:
- name: DandyDeveloper
Expand Down
15 changes: 13 additions & 2 deletions charts/opensearch/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Fixed
### Security

---

## [1.14.0]
### Added
- Update OpenSearch appVersion to 1.3.5.
### Changed
### Deprecated
### Removed
### Fixed
### Security
---
## [1.13.2]
### Added
Expand Down Expand Up @@ -466,8 +476,9 @@ config:
### Fixed
### Security

[Unreleased]: https://github.com/opensearch-project/helm-charts/compare/opensearch-1.13.2...HEAD
[1.13.1]: https://github.com/opensearch-project/helm-charts/compare/opensearch-1.13.1...opensearch-1.13.2
[Unreleased]: https://github.com/opensearch-project/helm-charts/compare/opensearch-1.14.0...HEAD
[1.14.0]: https://github.com/opensearch-project/helm-charts/compare/opensearch-1.13.2...opensearch-1.14.0
[1.13.2]: https://github.com/opensearch-project/helm-charts/compare/opensearch-1.13.1...opensearch-1.13.2
[1.13.1]: https://github.com/opensearch-project/helm-charts/compare/opensearch-1.13.0...opensearch-1.13.1
[1.13.0]: https://github.com/opensearch-project/helm-charts/compare/opensearch-1.12.1...opensearch-1.13.0
[1.12.1]: https://github.com/opensearch-project/helm-charts/compare/opensearch-1.12.0...opensearch-1.12.1
Expand Down
4 changes: 2 additions & 2 deletions charts/opensearch/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 1.13.2
version: 1.14.0

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
# It is recommended to use it with quotes.
appVersion: "1.3.4"
appVersion: "1.3.5"

maintainers:
- name: DandyDeveloper
Expand Down

0 comments on commit 5490f15

Please sign in to comment.