PMM-12576 PMM 2.40.1 fix admin ID

Percona-Lab · Oct 16, 2023 · 490aa28 · 490aa28
1 parent bdd56af
commit 490aa28
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,7 +1,7 @@
 [submodule "pmm"]
 	path = sources/pmm/src/github.com/percona/pmm
 	url = https://github.com/percona/pmm
-	branch = pmm-2.40.1
+	branch = PMM-12576-2.40.1-fix-admin-id
 
 # PMM Client
 

diff --git a/sources/pmm/src/github.com/percona/pmm b/sources/pmm/src/github.com/percona/pmm
+6 −3		build/packages/rpm/server/SPECS/grafana-db-migrator.spec
+3 −0		build/scripts/build-server-rpm
+3 −3		managed/services/telemetry/telemetry.go
+1 −2		managed/services/telemetry/telemetry_test.go
+24 −9		update/ansible/playbook/tasks/roles/initialization/tasks/main.yml
+46 −0		update/ansible/playbook/tasks/roles/sqlite-to-postgres/tasks/main.yml
+6 −0		update/ansible/playbook/tasks/update.yml