Merge branch 'main' into sparsehistogram

3 years ago · 94729d9936
parent 12486b1250 9486be535b
commit 94729d9936
3 changed files with 6 additions and 4 deletions
--- a/MAINTAINERS.md
+++ b/MAINTAINERS.md
@ -1,4 +1,4 @@
-Julien Pivotto (<roidelapluie@prometheus.io> / @roidelapluie) is the main/default maintainer, some parts of the codebase have other maintainers:
+Julien Pivotto (<roidelapluie@prometheus.io> / @roidelapluie) and Levi Harrison (<levi@leviharrison.dev> / @LeviHarrison) are the main/default maintainers, some parts of the codebase have other maintainers:

 * `cmd`
  * `promtool`: David Leadbeater (<dgl@dgl.cx> / @dgl), Jessica Grebenschikov (<jessica.greben1@gmail.com> / @jessicagreben)
@ -19,4 +19,3 @@ size of this repository, the natural changes in focus of maintainers over time,
 and nuances of where particular features live, this list will always be
 incomplete and out of date. However the listed maintainer(s) should be able to
 direct a PR/question to the right person.
-
--- a/RELEASE.md
+++ b/RELEASE.md
@ -35,8 +35,8 @@ Release cadence of first pre-releases being cut is 6 weeks.
 | v2.28          | 2021-06-16                                 | Julius Volz (GitHub: @juliusv)              |
 | v2.29          | 2021-07-28                                 | Frederic Branczyk (GitHub: @brancz)         |
 | v2.30          | 2021-09-08                                 | Ganesh Vernekar (GitHub: @codesome)         |
-| v2.31          | 2021-10-20                                 | **searching for volunteer**                 |
-| v2.32          | 2021-12-01                                 | **searching for volunteer**                 |
+| v2.31          | 2021-10-20                                 | Julien Pivotto (GitHub: @roidelapluie)      |
+| v2.32          | 2021-12-01                                 | Julius Volz (GitHub: @juliusv)              |
 | v2.33          | 2022-01-12                                 | **searching for volunteer**                 |

 If you are interested in volunteering please create a pull request against the [prometheus/prometheus](https://github.com/prometheus/prometheus) repository and propose yourself for the release series of your choice.
--- a/pkg/README.md
+++ b/pkg/README.md
@ -0,0 +1,3 @@
+The `pkg` directory is deprecated.
+Please do not add new packages to this directory.
+Existing packages will be moved elsewhere eventually.