Skip to content

Commit

Permalink
Merge branch 'main' into ds-config-yml
Browse files Browse the repository at this point in the history
  • Loading branch information
zengyan-amazon authored Sep 29, 2022
2 parents 9281d51 + 00dcce7 commit b3917a8
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 0 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
* Adding @zengyan-amazon as maintainer ([#2419](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/2419))
* Updating @tmarkley to Emeritus status. ([#2423](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/2423))
* Adding sample config for multi data source in yml config template. ([#2428](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/2428))
* Adding @kristenTian as maintainer. ([#2450](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/2450))

### 🪛 Refactoring

Expand Down
1 change: 1 addition & 0 deletions MAINTAINERS.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
| Josh Romero | [joshuarrrr](https://github.com/joshuarrrr) | Amazon |
| Abby Hu | [abbyhu2000](https://github.com/abbyhu2000) | Amazon |
| Yan Zeng | [zengyan-amazon](https://github.com/zengyan-amazon) | Amazon |
| Kristen Tian | [kristenTian](https://github.com/kristenTian) | Amazon |

## Emeritus

Expand Down

0 comments on commit b3917a8

Please sign in to comment.