aboutsummaryrefslogtreecommitdiffstats
path: root/controller-api/src
diff options
context:
space:
mode:
authorFrode Lundgren <frodelu@yahoo-inc.com>2018-10-23 12:22:34 +0200
committerFrode Lundgren <frodelu@yahoo-inc.com>2018-10-23 12:22:34 +0200
commit6ed0d7389b1569fa1a4ebcc963bdcd96477afb3a (patch)
tree4d0640923285758318ef678711da484e47dc38b6 /controller-api/src
parent0f5f50f33c0d8e7caad7d49c66eb62e3feb6521e (diff)
parent697513612152dceff2ed41540b9c820e60928420 (diff)
Merge branch 'revert-7116-revert-7098-frodelu/combined-api-uris' of github.com:vespa-engine/vespa into revert-7116-revert-7098-frodelu/combined-api-uris
Diffstat (limited to 'controller-api/src')
0 files changed, 0 insertions, 0 deletions