summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Set version to 3.2.1v3.2.1Luca Milanesio2020-06-075-5/+5
| | | | Change-Id: I80ddbc25cba71050291edf00138a77eba52157a2
* Merge branch 'stable-3.1' into stable-3.2Luca Milanesio2020-06-0716-42/+594
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-3.1: Fix header of "Pitfalls" subsection of Private Changes documentation AccountIT#accountIdApi: Get account API with id rather than name Fix header of "Pitfalls" subsection of Private Changes documentation Set version to 2.15.20-SNAPSHOT Set version to 2.15.19 Close open SSH connections upon account deactivation Allow to listen for account deactivations Extract method to iterate SSH sessions CacheBasedWebSession: Remove unnecessary 'final' in constructor args Add account listener integration tests using a real plugin Bazel: Add always pass test to avoid boilerplate in the CI Deny access over HTTP for disabled accounts Bazel: Consistently use bazelisk during publishing of artifacts Change-Id: I2d23a6fdcf6b44a9f55f3c01f5090aa8f0a343d4
| * Merge branch 'stable-3.0' into stable-3.1Luca Milanesio2020-06-063-4/+115
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-3.0: Fix header of "Pitfalls" subsection of Private Changes documentation AccountIT#accountIdApi: Get account API with id rather than name Set version to 2.15.20-SNAPSHOT Set version to 2.15.19 CacheBasedWebSession: Remove unnecessary 'final' in constructor args Bazel: Add always pass test to avoid boilerplate in the CI Deny access over HTTP for disabled accounts Bazel: Consistently use bazelisk during publishing of artifacts Change-Id: I9c7270c45834b68ede0d7eee6d054aff5b9a4b90
| | * Fix header of "Pitfalls" subsection of Private Changes documentationDavid Pursehouse2020-06-061-2/+1
| | | | | | | | | | | | | | | Change-Id: I3dacba7ffd910122cf1dbd123276c6ef29fe5f14 (cherry picked from commit 2ba3b5a55d37315189104d4237c007bae01f908d)
| | * Merge branch 'stable-2.16' into stable-3.0David Pursehouse2020-06-063-4/+112
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-2.16: AccountIT#accountIdApi: Get account API with id rather than name Set version to 2.15.20-SNAPSHOT Set version to 2.15.19 CacheBasedWebSession: Remove unnecessary 'final' in constructor args Bazel: Add always pass test to avoid boilerplate in the CI Deny access over HTTP for disabled accounts Bazel: Consistently use bazelisk during publishing of artifacts Change-Id: I28bdd3ae65481ebe42efa09a2b775f90b6e9de60
| | | * AccountIT#accountIdApi: Get account API with id rather than nameDavid Pursehouse2020-06-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | On later branches, getting the account API with anything other than the id fails. Change-Id: If02dcf0f9268994b74d50256992ede8460d6c5e9
| | | * Merge branch 'stable-2.15' into stable-2.16David Pursehouse2020-06-060-0/+0
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-2.15: Set version to 2.15.20-SNAPSHOT Set version to 2.15.19 Change-Id: I98e82fb7d58e87b4111db863ca529e8d6e446713
| | | | * Set version to 2.15.20-SNAPSHOTLuca Milanesio2020-06-066-6/+6
| | | | | | | | | | | | | | | | | | | | Change-Id: Ia6aa8dd0fbc17f09329f7efe40bfa41a6e3f793b
| | | | * Set version to 2.15.19v2.15.19Luca Milanesio2020-06-066-6/+6
| | | | | | | | | | | | | | | | | | | | Change-Id: I9c1b41bcb134b799fb8508514b66a7a4a83a65ca
| | | * | Merge branch 'stable-2.15' into stable-2.16David Pursehouse2020-06-061-1/+1
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-2.15: CacheBasedWebSession: Remove unnecessary 'final' in constructor args Change-Id: I0ec45679c7d70e162a51d84325a6c76e00fe1316
| | | | * CacheBasedWebSession: Remove unnecessary 'final' in constructor argsDavid Pursehouse2020-06-061-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I77f11f9cc80a68f3ec63520fa6d12f0a70afc2f9
| | | * | Merge branch 'stable-2.15' into stable-2.16Luca Milanesio2020-06-063-4/+113
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-2.15: Bazel: Add always pass test to avoid boilerplate in the CI Deny access over HTTP for disabled accounts Bazel: Consistently use bazelisk during publishing of artifacts Change-Id: I29dd411d196f9e38688cdfbf94ae3f5ea7ed0ba8
| | | | * Merge branch 'stable-2.14' into stable-2.15Luca Milanesio2020-06-053-4/+115
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-2.14: Deny access over HTTP for disabled accounts Bazel: Consistently use bazelisk during publishing of artifacts Change-Id: I16c6c00e61ef39cc27f40da1ac1822e419eb2f2c
| | | | | * Deny access over HTTP for disabled accountsLuca Milanesio2020-06-053-7/+120
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When an account is disabled by the Gerrit admin through the set-account command, it should not be enabled to perform any further authentication or other actions. Allowing a disabled account to continue operating in Gerrit until his session expiration would be a security risk. Bug: Issue 12717 Change-Id: I4cbad70bb3c83a1916f0d6939c5ccbbe7c734619
| | | | | * Bazel: Consistently use bazelisk during publishing of artifactsDavid Ostrovsky2020-06-051-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1e3d7ceaf7908f3b53a5b11a257aa752eaec066e (cherry picked from commit 9c7428264769e9c211c0cf23a2d6ec9406be791b)
| | | | * | Bazel: Add always pass test to avoid boilerplate in the CIDavid Ostrovsky2020-06-052-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't know whether or not all plugins have test rules, so running a generic command: $ bazelisk test plugins/{name}/... can lead to no tests found outcome, in which case Bazel will return exit code 4 that needs to be checked to differentiate from test failure (exit code 1). To avoid those checks, pass the virtual test that will always succeed: $ bazelisk test //tools/bzl:always_pass_test plugins/{name}/... See also this upstream issue for this suggested workaround: [1]. [1] https://github.com/bazelbuild/bazel/issues/11465 Change-Id: Ideab64674482400cc48fad55f7ed9f8085909b84 (cherry picked from commit d69773ceb5c84cfcf13749b2f555bf92d22e6f71)
| * | | | | Fix header of "Pitfalls" subsection of Private Changes documentationDavid Pursehouse2020-06-061-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3dacba7ffd910122cf1dbd123276c6ef29fe5f14
| * | | | | Close open SSH connections upon account deactivationChristian Aistleitner2020-06-062-0/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Deactivating an account prohibits logging in on new SSH connections. But it did not close already open connections (which may be kept open long into the future as for example stream-events) and did not prohibit opening new sessions on existing authenticated connections. By closing all open sessions for a user upon deactivation, we force the user through authentication again. Thereby, we lock out inactive users, as this authentication will fail as the account is now inactive. Change-Id: Icbe6f04a96297ee7d7e3748562a3f95206fb9ed2
| * | | | | Allow to listen for account deactivationsChristian Aistleitner2020-06-068-8/+156
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Deactivating an account currently does not purge active SSH connections (E.g.: long-running stream-events) and does not purge the web session cache. So deactivating a user for real requires to also manually purge these connections and caches, which is unnecessarily tedious. Implementing such code directly in SetInactiveFlag is not straight forward as com.google.server.account does not have access to the sshd package, and naively adding it to the build introduces a circular dependency. So we add an extension point for account deactivation. Thereby, core components and plugins can self-cater cache purging and other house-holding tasks upon user deactivation without messing with the build. Change-Id: I1dfa1779acfe56e5c7f1666b1e83e83f954083e1
| * | | | | Extract method to iterate SSH sessionsChristian Aistleitner2020-06-063-32/+97
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thereby, we make code re-usable for upcoming commits. Add coverage to the SSH command close-connection in the SshCommandsIT to make sure that the refactoring does not introduce any regression. Change-Id: Id017687b53750360a52dd020335a7f433d123e6e
| * | | | | Add account listener integration tests using a real pluginChristian Aistleitner2020-06-061-0/+165
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While AccountIT already provides an integration test for the validation listeners, it does so without using a real plugin. Add a wiring integration test using a real plugin to make sure plugin wiring is working as expected. See review of https://gerrit-review.googlesource.com/c/gerrit/+/265638 Change-Id: I35988f3eb4cfe947fe65c418bb7cfc51af5d2124
* | | | | | Merge branch 'stable-3.1' into stable-3.2Marco Miller2020-06-0516-51/+231
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-3.1: Remove Hugo Arès from developers section in pom.xml files ElasticContainer: Upgrade V6_8 to elasticsearch 6.8.10 Upgrade elasticsearch-rest-client to 7.7.1 ElasticContainer: Upgrade V7_7 to elasticsearch 7.7.1 Support /COMMIT_MSG for change edit REST endpoints IntBlob: Add debug log when storing value on ref RepoSequence: Add debug log when acquiring new sequence batch Bazel: Remove version suffix from servlet-api-3_1 rule Update no-new-changes error doc Ignore WIP changes in "CCed on" dashboard section Sequences: Introduce constants for configuration keys/values RepoSequence: Add debug log of batch size Move Flogger to nongoogle.bzl DefaultRefFilter#canSeeSingleChangeRef: Do not fail for invalid change refs Upgrade testcontainers to 1.14.3 Add missing documentation of notedb.changes.sequenceBatchSize Enable rolling upgrade to next versions Change-Id: I73cfa328b97619440f25374c0380760dd54ec646
| * | | | | Merge branch 'stable-3.0' into stable-3.1Marco Miller2020-06-058-22/+43
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-3.0: Remove Hugo Arès from developers section in pom.xml files ElasticContainer: Upgrade V6_8 to elasticsearch 6.8.10 Upgrade elasticsearch-rest-client to 7.7.1 ElasticContainer: Upgrade V7_7 to elasticsearch 7.7.1 Support /COMMIT_MSG for change edit REST endpoints Change-Id: I911d0d687a74a629d5a5955420e040088204bbd9
| | * | | | Merge branch 'stable-2.16' into stable-3.0David Pursehouse2020-06-052-6/+39
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-2.16: Support /COMMIT_MSG for change edit REST endpoints Change-Id: Id28295be0f203f93c8932ac4cd9b5a4bab04f892
| | | * | | Support /COMMIT_MSG for change edit REST endpointsEdwin Kempin2020-06-042-6/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The change edit REST endpoints to get and set file contents failed with "409 Conflict: Invalid path: /COMMIT_MSG" if the magic file "/COMMIT_MSG" is used to update the commit message. This is what is currently used by PolyGerrit if you have a change edit, open the diff via for the commit message and then try to edit and save the file content. Updating the commit message of change edits from the change screen works, because that is using a dedicated REST endpoint to update the commit message. This fix makes the change edit REST endpoints aware of the magic file "/COMMIT_MSG" by making them forward the request to the dedicated REST endpoints to get/set the commit message. Alternatively PolyGerrit could be changed to directly use these REST endpoints when the commit message is edited. Bug: Issue 11706 Signed-off-by: Edwin Kempin <ekempin@google.com> Change-Id: I5c2ef8dbabe72e04ed61606e7b923d877efa3a23
| | * | | | Merge "Remove Hugo Arès from developers section in pom.xml files" into ↵David Pursehouse2020-06-054-12/+0
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | stable-3.0
| | | * | | | Remove Hugo Arès from developers section in pom.xml filesDavid Pursehouse2020-06-054-12/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a follow-up to [1] where Hugo was moved to the "Former" section of the maintainers list. All other former maintainers are already removed from the developers section. [1] https://gerrit-review.googlesource.com/c/homepage/+/266394 Change-Id: I2b1220db82f0a504cf45d2d328fd0347568f391a
| | * | | | | ElasticContainer: Upgrade V6_8 to elasticsearch 6.8.10Marco Miller2020-06-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I208764b373bc46957e79a5c887b63ac28c79ff6f
| | * | | | | ElasticContainer: Upgrade V7_7 to elasticsearch 7.7.1Marco Miller2020-06-041-1/+1
| | |/ / / / | | | | | | | | | | | | | | | | | | Change-Id: Ibad2867e70d9ae960428bed7c127bc35f93b73b5
| | * | | | Upgrade elasticsearch-rest-client to 7.7.1David Pursehouse2020-06-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I16784371a8487cb05e705d7edf4c075fb6392ed0
| * | | | | Merge branch 'stable-3.0' into stable-3.1Marco Miller2020-06-0410-34/+96
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-3.0: IntBlob: Add debug log when storing value on ref RepoSequence: Add debug log when acquiring new sequence batch Bazel: Remove version suffix from servlet-api-3_1 rule Update no-new-changes error doc Ignore WIP changes in "CCed on" dashboard section Sequences: Introduce constants for configuration keys/values RepoSequence: Add debug log of batch size Move Flogger to nongoogle.bzl DefaultRefFilter#canSeeSingleChangeRef: Do not fail for invalid change refs Upgrade testcontainers to 1.14.3 Add missing documentation of notedb.changes.sequenceBatchSize Change-Id: I9e135202b7f520a6267b9ad94c97ed58c8f67233
| | * | | | Merge "Bazel: Remove version suffix from servlet-api-3_1 rule" into stable-3.0Edwin Kempin2020-06-0422-27/+27
| | |\ \ \ \
| | | * | | | Bazel: Remove version suffix from servlet-api-3_1 ruleDavid Ostrovsky2020-06-0422-27/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes this artifact upgrade friendly. Bug: Issue 12865 Change-Id: I37459989f83d6c362c656b870e87743cd3374378
| | * | | | | IntBlob: Add debug log when storing value on refDavid Pursehouse2020-06-041-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id680c3e73de473f8d7f4b8bf176b6f561ad427e7
| | * | | | | RepoSequence: Add debug log when acquiring new sequence batchDavid Pursehouse2020-06-041-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If7ccc1a7582ccca51bfd4258a92aca60dab40ef1
| | * | | | | Merge branch 'stable-2.16' into stable-3.0David Pursehouse2020-06-041-5/+16
| | |\ \ \ \ \ | | | |/ / / / | | |/| / / / | | | |/ / / | | | | | | | | | | | | | | | | | | * stable-2.16: Update no-new-changes error doc Change-Id: I1208952711764bfe5d0c1ba91556157ca5477f01
| | | * | | Update no-new-changes error docMartin Fick2020-06-031-5/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The notion of pushing while specifying a merge-base, or moving changes was never reflected, update the doc to do so. Change-Id: I96d41c651cbe2f81d4014d0ff090f2ed66a3a8c1
| | * | | | Ignore WIP changes in "CCed on" dashboard sectionDavid Ostrovsky2020-06-031-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Even though the WorkInProgress design proposal only mentions that WIP changes are subtracted from "Incoming reviews" section: " The query driving the existing *Incoming reviews* section subtracts WIP changes from the result. This has the effect of hiding WIP changes from their reviewers' dashboards. " consistently also subtract the WIP changes from the "CCed on" dashboard section. Bug: Issue 12850 Change-Id: Ibab954bb6b3b8a66d4da842bc1ac3f53e8e18a68
| | * | | | Sequences: Introduce constants for configuration keys/valuesDavid Pursehouse2020-06-031-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the existing constants for "accounts" and "changes", and add new constants for "noteDb" and "sequenceBatchSize". Add new constants for the default sequence batch sizes for accounts and changes. Change-Id: I6ed0c09bcbf4fc636fcc6a0107b75f971fb2d080
| | * | | | RepoSequence: Add debug log of batch sizeDavid Pursehouse2020-06-031-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2751d2e20d138794cc8e1e3e78b124390bf934c1 Signed-off-by: David Pursehouse <dpursehouse@digital.ai>
| | * | | | Move Flogger to nongoogle.bzlHan-Wen Nienhuys2020-06-033-20/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gerrit is linked against the canonical source directly inside Google, so there is no version skew concern. Change-Id: Ifae82a75700bf15e48a04476d7e76c2a1e6b8a71 (cherry picked from commit 2d9f77f745353bb6dabd08ac129d09f9e1281ec7)
| | * | | | DefaultRefFilter#canSeeSingleChangeRef: Do not fail for invalid change refsEdwin Kempin2020-06-031-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If there is a ref that starts with refs/changes/ but is not a valid change ref, we should not fail. If the change ref is invalid it doesn't represent a change and hence we should treat it as non-visible. Change-Id: Ib5f00a63ba5d6881b4520aa488bf111e45b137ee Signed-off-by: Edwin Kempin <ekempin@google.com> (cherry picked from commit 3cdf7fdcf039136d959716945d001c561e4ff17c)
| | * | | | Upgrade testcontainers to 1.14.3Marco Miller2020-06-021-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8b301f0a55372b224cdd97306f882ef67ee890cb
| | * | | | Add missing documentation of notedb.changes.sequenceBatchSizeDavid Pursehouse2020-06-021-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0bf732cb9ce3be5ac8f2ffd261feccf8a88916b8
| * | | | | Enable rolling upgrade to next versionsLuca Milanesio2020-06-013-2/+132
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gerrit version N and N+1 (e.g. Gerrit v3.1 is N, v3.2 is N+1) have typically a semi-compatible schema which enables the ability to perform a live-upgrade to the new release without the need of a general outage. Document how to enable rolling upgrade mode and make the schema version check more flexible so that two versions can share the same repositories over NFS. Test plan: 1. Install Gerrit version N on two nodes sharing the repositories over NFS. 2. Set gerrit.experimentalRollingUpgrade to true 3. Upgrade one of the two nodes to version N+1 4. Both nodes should be able to stop/start without issues 5. Both nodes should be able to serve read/writes without issues 6. Upgrade the other node then confirm as above. Change-Id: I8ceb352365da2eb553d82495c9635eb034e57352
* | | | | | Set version to 3.2.1-SNAPSHOTLuca Milanesio2020-06-015-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2a94c13deb16ff7349ae4988ee74f66ff54dd82a
* | | | | | Set version to 3.2.0v3.2.0Luca Milanesio2020-06-015-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I49bb21ac73c0358617dc2acafeaf032e436cf3d5
* | | | | | Merge branch 'stable-3.1' into stable-3.2Luca Milanesio2020-06-0120-25/+268
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-3.1: When writing temporary plugin files, ensure the directory exists Update git submodules Update git submodules Fix gr-label-info test Set version to 2.16.21-SNAPSHOT Set version to 2.16.20 Trim parameterized strings evaluated from LdapRealm Update account full name when it changes in LDAP Set Api version for plugin jars Update git submodules Update git submodules Update git submodules Update git submodules Update git submodules Update git submodules e2e-tests: Add {Approve|Submit}Change core scenarios Hide "No Votes" notice for for labels added and approved by rules Change-Id: I5c2450f3ead115d143102eeaff990e8daf66f5e8
| * | | | | Merge branch 'stable-3.0' into stable-3.1Luca Milanesio2020-06-010-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-3.0: Update git submodules Update git submodules Change-Id: Iacd42b02881fc3948047a054909b7de67d28fb9a
| | * | | | Merge branch 'stable-2.16' into stable-3.0Luca Milanesio2020-06-010-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-2.16: Update git submodules Change-Id: I23313958744af6ea96f9a8a592c47978c703ed43