From 4afe65c86a53ced59f654f2142839e6d08b8dd05 Mon Sep 17 00:00:00 2001 From: Artem Gavrilov Date: Tue, 28 Jul 2020 16:57:36 +0200 Subject: [PATCH 1/2] SAAS-175 Feature build --- .gitmodules | 6 +++--- .../pmm-api-tests/src/github.com/Percona-Lab/pmm-api-tests | 2 +- sources/pmm-managed/src/github.com/percona/pmm-managed | 2 +- sources/pmm/src/github.com/percona/pmm | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitmodules b/.gitmodules index 9c5faeb2306f..38f49a6f30a9 100644 --- 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.0 + branch = SAAS-175-auth-api # PMM Client @@ -53,7 +53,7 @@ [submodule "pmm-managed"] path = sources/pmm-managed/src/github.com/percona/pmm-managed url = https://github.com/percona/pmm-managed - branch = PMM-2.0 + branch = SAAS-175-auth-api [submodule "dbaas-controller"] path = sources/dbaas-controller/src/github.com/percona-platform/dbaas-controller url = https://github.com/percona-platform/dbaas-controller @@ -91,7 +91,7 @@ [submodule "pmm-api-tests"] path = sources/pmm-api-tests/src/github.com/Percona-Lab/pmm-api-tests url = https://github.com/Percona-Lab/pmm-api-tests - branch = master + branch = SAAS-175-auth-api [submodule "pmm-qa"] path = sources/pmm-qa/src/github.com/percona/pmm-qa url = https://github.com/percona/pmm-qa diff --git a/sources/pmm-api-tests/src/github.com/Percona-Lab/pmm-api-tests b/sources/pmm-api-tests/src/github.com/Percona-Lab/pmm-api-tests index b8f65f963ee3..e9392171e90d 160000 --- a/sources/pmm-api-tests/src/github.com/Percona-Lab/pmm-api-tests +++ b/sources/pmm-api-tests/src/github.com/Percona-Lab/pmm-api-tests @@ -1 +1 @@ -Subproject commit b8f65f963ee386d1136450fc4d929afabac1283d +Subproject commit e9392171e90d01974736633af1e20c0b2dc6fdc1 diff --git a/sources/pmm-managed/src/github.com/percona/pmm-managed b/sources/pmm-managed/src/github.com/percona/pmm-managed index 22f1588c248f..9a2cc8c21004 160000 --- a/sources/pmm-managed/src/github.com/percona/pmm-managed +++ b/sources/pmm-managed/src/github.com/percona/pmm-managed @@ -1 +1 @@ -Subproject commit 22f1588c248fd2c01609fa852369fbddbaf95068 +Subproject commit 9a2cc8c21004570be5afbb69158d29518a23e4e2 diff --git a/sources/pmm/src/github.com/percona/pmm b/sources/pmm/src/github.com/percona/pmm index 0e4ce72c3f89..a25b4652b3f7 160000 --- a/sources/pmm/src/github.com/percona/pmm +++ b/sources/pmm/src/github.com/percona/pmm @@ -1 +1 @@ -Subproject commit 0e4ce72c3f89996e3a4bd613520dbd6218909a16 +Subproject commit a25b4652b3f7463342fd142a9bfb67495dff0aa7 From b16db44625bae43e63eee4e831f9f24811fdfaec Mon Sep 17 00:00:00 2001 From: Alexey Palazhchenko Date: Tue, 28 Jul 2020 19:15:13 +0300 Subject: [PATCH 2/2] Rewind --- .gitmodules | 2 +- sources/grafana-dashboards | 2 +- sources/pmm-api-tests/src/github.com/Percona-Lab/pmm-api-tests | 2 +- sources/pmm-managed/src/github.com/percona/pmm-managed | 2 +- sources/pmm/src/github.com/percona/pmm | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index 38f49a6f30a9..b4f0d8655bb6 100644 --- 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 = SAAS-175-auth-api + branch = PMM-2.0 # PMM Client diff --git a/sources/grafana-dashboards b/sources/grafana-dashboards index fc73ac072cbf..fc76a5fc9f7b 160000 --- a/sources/grafana-dashboards +++ b/sources/grafana-dashboards @@ -1 +1 @@ -Subproject commit fc73ac072cbfaeb8d24ec1192a9a7c0d2a87703b +Subproject commit fc76a5fc9f7bb28903323f1232c22049c4acb420 diff --git a/sources/pmm-api-tests/src/github.com/Percona-Lab/pmm-api-tests b/sources/pmm-api-tests/src/github.com/Percona-Lab/pmm-api-tests index e9392171e90d..2a1c9e57f408 160000 --- a/sources/pmm-api-tests/src/github.com/Percona-Lab/pmm-api-tests +++ b/sources/pmm-api-tests/src/github.com/Percona-Lab/pmm-api-tests @@ -1 +1 @@ -Subproject commit e9392171e90d01974736633af1e20c0b2dc6fdc1 +Subproject commit 2a1c9e57f4080613446c527bde65d4f605e5f06d diff --git a/sources/pmm-managed/src/github.com/percona/pmm-managed b/sources/pmm-managed/src/github.com/percona/pmm-managed index 9a2cc8c21004..e7a26b98e020 160000 --- a/sources/pmm-managed/src/github.com/percona/pmm-managed +++ b/sources/pmm-managed/src/github.com/percona/pmm-managed @@ -1 +1 @@ -Subproject commit 9a2cc8c21004570be5afbb69158d29518a23e4e2 +Subproject commit e7a26b98e0201fc2e6d0bf9de7f9f2ecf9faa5f3 diff --git a/sources/pmm/src/github.com/percona/pmm b/sources/pmm/src/github.com/percona/pmm index a25b4652b3f7..c538a89c38d8 160000 --- a/sources/pmm/src/github.com/percona/pmm +++ b/sources/pmm/src/github.com/percona/pmm @@ -1 +1 @@ -Subproject commit a25b4652b3f7463342fd142a9bfb67495dff0aa7 +Subproject commit c538a89c38d8ab0fcaebd2c1ff02c581106f7bca