diff options
| author | Øyvind Grønnesby <oyving@verizonmedia.com> | 2019-07-11 13:45:17 +0200 |
|---|---|---|
| committer | Øyvind Grønnesby <oyving@verizonmedia.com> | 2019-07-11 13:45:17 +0200 |
| commit | 9549a8005480a3fe61fb087e359a4a442180819f (patch) | |
| tree | e76ded2ddf9a8127cd780304105313c22640c8dc /configserver/src/main/sh/vespa-configserver-remove-state | |
| parent | 9f3a3b9f6962bd20714b99a046860de1886be600 (diff) | |
| parent | 1c79079945c56fa91de8427fbc8f2170eec9ed8c (diff) | |
Merge remote-tracking branch 'origin/master' into olaa/cfg-server-metric-aggregation
Conflicts:
configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java
controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/ConfigServer.java
controller-server/src/main/java/com/yahoo/vespa/hosted/controller/LockedApplication.java
controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/ApplicationSerializer.java
Diffstat (limited to 'configserver/src/main/sh/vespa-configserver-remove-state')
| -rwxr-xr-x | configserver/src/main/sh/vespa-configserver-remove-state | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/configserver/src/main/sh/vespa-configserver-remove-state b/configserver/src/main/sh/vespa-configserver-remove-state index faac37d48d4..c5cee479388 100755 --- a/configserver/src/main/sh/vespa-configserver-remove-state +++ b/configserver/src/main/sh/vespa-configserver-remove-state @@ -80,6 +80,9 @@ usage() { echo "The following options are recognized:" echo "" + echo "-h|-help) print this help text" + echo "-nosudo do not use sudo when running command" + echo "-sudo use sudo when running command" echo "-force do not ask for confirmation before removal" ) >&2 } @@ -101,7 +104,7 @@ while [ $# -gt 0 ]; do -h|-help) usage; exit 0;; -nosudo) shift; sudo="" ;; -sudo) shift; sudo="sudo" ;; - -force) shift; ask=false ;; + -force) shift; ask=false ;; *) echo "Unrecognized option '$1'" >&2; usage; exit 1;; esac done |