diff options
| author | Valerij Fredriksen <valerijf@oath.com> | 2017-09-22 10:12:34 +0200 |
|---|---|---|
| committer | Valerij Fredriksen <valerijf@oath.com> | 2017-09-22 10:12:34 +0200 |
| commit | a8afd010fbc4ab3da20b99976b0e926fd379b0f1 (patch) | |
| tree | a1dc57fbbc14519df4fc5c25f49d1e2a3f378ce3 | |
| parent | 383fc35d456ef7c58901da664426e6a1e274aa75 (diff) | |
| parent | 4793ea0e855c05f96910fb373339dc89cb74550f (diff) | |
Merge remote-tracking branch 'origin/freva/node-admin-shutdown' into freva/node-admin-shutdown
# Conflicts:
# node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/provider/NodeAdminProvider.java
0 files changed, 0 insertions, 0 deletions