summaryrefslogtreecommitdiffstats
path: root/controller-server
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorn.christian@seime.no>2018-10-05 15:47:11 +0200
committerGitHub <noreply@github.com>2018-10-05 15:47:11 +0200
commit6c7553bf223d3497addfd3038eaea68121dff390 (patch)
tree699719fb08e8dff19b10376c2b44e492be3e0084 /controller-server
parent03d53db21ad4d4928e9574cfa8b3199e642c213d (diff)
parent19efe25258b6edd6a1f82393fe5468c90cd6c82b (diff)
Merge pull request #7216 from vespa-engine/mortent/new-copper-argos-reqs
Implement new copper argos reqs
Diffstat (limited to 'controller-server')
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/athenz/mock/ZtsClientMock.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/athenz/mock/ZtsClientMock.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/athenz/mock/ZtsClientMock.java
index 8b3fb3ca47e..4c586d660e7 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/athenz/mock/ZtsClientMock.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/athenz/mock/ZtsClientMock.java
@@ -73,12 +73,12 @@ public class ZtsClientMock implements ZtsClient {
}
@Override
- public X509Certificate getRoleCertificate(AthenzRole role, Duration expiry, KeyPair keyPair, String cloud) {
+ public X509Certificate getRoleCertificate(AthenzRole role, Pkcs10Csr csr, Duration expiry) {
throw new UnsupportedOperationException();
}
@Override
- public X509Certificate getRoleCertificate(AthenzRole role, KeyPair keyPair, String cloud) {
+ public X509Certificate getRoleCertificate(AthenzRole role, Pkcs10Csr csr) {
throw new UnsupportedOperationException();
}