diff options
| author | Øyvind Grønnesby <oyving@verizonmedia.com> | 2020-12-03 19:33:21 +0100 |
|---|---|---|
| committer | Øyvind Grønnesby <oyving@verizonmedia.com> | 2020-12-03 19:33:21 +0100 |
| commit | 2b01b49d4f9fa0338c00a113daf7e61e10041646 (patch) | |
| tree | 2c970f2cae118746977147fbaca49e5f0c02c09a /container-dependencies-enforcer | |
| parent | f0771b2201f06684f66c7261c528167adb8f4c7b (diff) | |
| parent | 5ad34990803dc859ee107ba46b3e60ef877898ca (diff) | |
Merge remote-tracking branch 'origin/master' into ogronnesby/trial-tenant-limit
Conflicts:
controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/user/UserApiHandler.java
controller-server/src/main/java/com/yahoo/vespa/hosted/controller/security/CloudAccessControl.java
flags/src/main/java/com/yahoo/vespa/flags/Flags.java
Diffstat (limited to 'container-dependencies-enforcer')
0 files changed, 0 insertions, 0 deletions