Remove unused option, rename variables

2 files changed, 3 insertions, 7 deletions

diff --git a/config/src/apps/vespa-configproxy-cmd/methods.cpp b/config/src/apps/vespa-configproxy-cmd/methods.cpp
index 34f552cb2fe..e4cd84097a6 100644
--- a/config/src/apps/vespa-configproxy-cmd/methods.cpp
+++ b/config/src/apps/vespa-configproxy-cmd/methods.cpp
@@ -8,7 +8,7 @@ namespace methods {
 const Method methods[] = {
     { "cache", "listCachedConfig", 0 },
     { "dumpcache", "dumpCache", 1 }, // filename
-    { "getConfig", "getConfig", 7 }, // defName defVersion defMD5 configid configMD5 timestamp timeout
+    { "getConfig", "getConfig", 7 }, // defName defVersion defMD5 configid configXXhash64 timestamp timeout
     { "getmode", "getMode", 0 },
     { "invalidatecache", "invalidateCache", 0 },
     { "cachefull", "listCachedConfigFull", 0 },
diff --git a/config/src/apps/vespa-get-config/getconfig.cpp b/config/src/apps/vespa-get-config/getconfig.cpp
index 16d1032da5c..e6375ac9c47 100644
--- a/config/src/apps/vespa-get-config/getconfig.cpp
+++ b/config/src/apps/vespa-get-config/getconfig.cpp
@@ -55,7 +55,6 @@ GetConfig::usage()
     fprintf(stderr, "-a schema         (config def schema file, optional)\n");
     fprintf(stderr, "-v defVersion     (config definition version, optional, deprecated)\n");
     fprintf(stderr, "-m defMd5         (definition md5sum, optional)\n");
-    fprintf(stderr, "-c configMd5      (config md5sum, optional)\n");
     fprintf(stderr, "-t serverTimeout  (server timeout in seconds, default 3)\n");
     fprintf(stderr, "-w timeout        (timeout in seconds, default 10)\n");
     fprintf(stderr, "-s server         (server hostname, default localhost)\n");
@@ -108,7 +107,7 @@ GetConfig::Main()
     if (configId == nullptr) {
         configId = "";
     }
-    const char *configMD5 = "";
+    const char *configXxhash64 = "";
     int serverTimeout = 3;
     int clientTimeout = 10;
 
@@ -142,9 +141,6 @@ GetConfig::Main()
         case 'm':
             defMD5 = optArg;
             break;
-        case 'c':
-            configMD5 = optArg;
-            break;
         case 't':
             serverTimeout = atoi(optArg);
             break;
@@ -219,7 +215,7 @@ GetConfig::Main()
     FRTConfigRequestFactory requestFactory(traceLevel, vespaVersion, config::protocol::readProtocolCompressionType());
     FRTConnection connection(spec, _server->supervisor(), TimingValues());
     ConfigKey key(configId, defName, defNamespace, defMD5, defSchema);
-    ConfigState state(configMD5, generation, false);
+    ConfigState state(configXxhash64, generation, false);
     FRTConfigRequest::UP request = requestFactory.createConfigRequest(key, &connection, state, serverTimeout * 1000);
 
     _target->InvokeSync(request->getRequest(), clientTimeout); // seconds