This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit a1299003945e410ef8884d5acee481a95c210278
Merge: 80aceda 21d878e
Author: stephen <spmalle...@gmail.com>
AuthorDate: Fri Dec 13 21:49:57 2019 -0500
Merge branch 'tp34'
CHANGELOG.asciidoc | 1 +
.../apache/tinkerpop/gremlin/driver/Client.java | 2 ++
.../gremlin/server/GremlinDriverIntegrateTest.java | 27 ++++++++++++++++++++++
3 files changed, 30 insertions(+)
diff --cc
gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Client.java
index 12fd0ac,9cbc337..51b8ed6
---
a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Client.java
+++
b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Client.java
@@@ -564,7 -564,9 +564,9 @@@ public abstract class Client
// apply settings if they were made available
options.getBatchSize().ifPresent(batchSize ->
request.add(Tokens.ARGS_BATCH_SIZE, batchSize));
- options.getTimeout().ifPresent(timeout ->
request.add(Tokens.ARGS_SCRIPT_EVAL_TIMEOUT, timeout));
+ options.getTimeout().ifPresent(timeout ->
request.add(Tokens.ARGS_EVAL_TIMEOUT, timeout));
+
options.getOverrideRequestId().ifPresent(request::overrideRequestId);
+ options.getUserAgent().ifPresent(userAgent ->
request.add(Tokens.ARGS_USER_AGENT, userAgent));
return submitAsync(request.create());
} catch (Exception ex) {
