diff options
author | Valerij Fredriksen <freva@users.noreply.github.com> | 2020-02-10 11:03:03 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-02-10 11:03:03 +0100 |
commit | 83ab3e59bfc00c35deae3d8138f407553fdc38b0 (patch) | |
tree | 63b8e663704801edd84be18600474c08ee56a19c | |
parent | 2fb3b11480e049cea184c96824f9ac6ab11e4c46 (diff) | |
parent | 0a0ea1373cdcf3e4db6310bb20effe6360995d3a (diff) |
Merge pull request #12130 from vespa-engine/freva/add-combined
Add combined cluster type serialization
-rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java index c06194fcd73..bf1b6c5ab84 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java @@ -27,10 +27,10 @@ import com.yahoo.security.KeyUtils; import com.yahoo.slime.Cursor; import com.yahoo.slime.Inspector; import com.yahoo.slime.Slime; +import com.yahoo.slime.SlimeUtils; import com.yahoo.vespa.athenz.api.AthenzIdentity; import com.yahoo.vespa.athenz.api.AthenzPrincipal; import com.yahoo.vespa.athenz.api.AthenzUser; -import com.yahoo.slime.SlimeUtils; import com.yahoo.vespa.hosted.controller.AlreadyExistsException; import com.yahoo.vespa.hosted.controller.Application; import com.yahoo.vespa.hosted.controller.Controller; @@ -645,6 +645,7 @@ public class ApplicationApiHandler extends LoggingRequestHandler { case admin: return "admin"; case content: return "content"; case container: return "container"; + case combined: return "combined"; default: throw new IllegalArgumentException("Unexpected node cluster type '" + type + "'."); } } |