fix

Percona-Lab · May 26, 2022 · 1540118 · 1540118
1 parent 02fcc3d
commit 1540118
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -57,7 +57,7 @@
 [submodule "pmm-managed"]
 	path = sources/pmm-managed/src/github.com/percona/pmm-managed
 	url = https://github.com/percona/pmm-managed
-	branch = PMM-5885-upgrade-postgres-to-14
+	branch = main
 [submodule "dbaas-controller"]
 	path = sources/dbaas-controller/src/github.com/percona-platform/dbaas-controller
 	url = https://github.com/percona-platform/dbaas-controller
@@ -69,11 +69,11 @@
 [submodule "pmm-update"]
 	path = sources/pmm-update/src/github.com/percona/pmm-update
 	url = https://github.com/percona/pmm-update
-	branch = PMM-5885-upgrade-postgres-to-14
+	branch = main
 [submodule "pmm-server"]
 	path = sources/pmm-server
 	url = https://github.com/percona/pmm-server
-	branch = PMM-5885-upgrade-postgres-to-14
+	branch = main
 [submodule "grafana-dashboards"]
 	path = sources/grafana-dashboards
 	url = https://github.com/percona/grafana-dashboards

diff --git a/sources/pmm-managed/src/github.com/percona/pmm-managed b/sources/pmm-managed/src/github.com/percona/pmm-managed
diff --git a/sources/pmm-server b/sources/pmm-server
diff --git a/sources/pmm-update/src/github.com/percona/pmm-update b/sources/pmm-update/src/github.com/percona/pmm-update
+1 −1		api-tests/server/logs_test.go
+1 −1		services/supervisord/logs_test.go
+5 −0		.github/pull_request_template.md
+4 −0		ansible/roles/pmm2-images/meta/main.yml
+16 −2		ansible/roles/pmm2-images/tasks/main.yml
+39 −0		ansible/roles/postgres-init/tasks/main.yml
+3 −0		ansible/roles/postgres-init/vars/main.yml
+1 −0		packer/pmm2.json
+0 −10		rhel/SPECS/alertmanager.spec
+0 −6		rhel/SPECS/dbaas-controller.spec
+13 −14		rhel/SPECS/dbaas-tools.spec
+4 −3		rhel/SPECS/grafana.spec
+5 −2		rhel/SPECS/percona-dashboards.spec
+4 −8		rhel/SPECS/percona-qan-api2.spec
+4 −2		rhel/SPECS/pmm-server.spec
+4 −9		rhel/SPECS/pmm-update.spec
+5 −2		rhel/SPECS/victoriametrics.spec
+3 −3		supervisord.conf
+19 −8		ansible/playbook/tasks/roles/initialization/tasks/main.yml
+84 −0		ansible/playbook/tasks/roles/postgres-ascii-to-utf8/tasks/main.yml
+0 −145		ansible/playbook/tasks/roles/postgres/tasks/main.yml
+0 −4		ansible/playbook/tasks/update.yml