You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2020/11/20 20:30:02 UTC
[tinkerpop] 03/03: Merge branch '3.4-dev'
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 82739153a152d70170180cc43afa15f0cea6a06c
Merge: 5f79663 4d6538f
Author: Stephen Mallette <st...@amazon.com>
AuthorDate: Fri Nov 20 15:29:42 2020 -0500
Merge branch '3.4-dev'
CHANGELOG.asciidoc | 2 ++
.../tinkerpop/gremlin/process/computer/Memory.java | 6 ++++--
.../AbstractWarningVerificationStrategy.java | 4 ++--
.../verification/ReservedKeysVerificationStrategy.java | 12 +++++++++++-
.../ReservedKeysVerificationStrategyTest.java | 18 +++++++++++++++---
5 files changed, 34 insertions(+), 8 deletions(-)
diff --cc gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/verification/ReservedKeysVerificationStrategy.java
index d764693,b106884..28c59ca
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/verification/ReservedKeysVerificationStrategy.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/verification/ReservedKeysVerificationStrategy.java
@@@ -18,7 -18,8 +18,8 @@@
*/
package org.apache.tinkerpop.gremlin.process.traversal.strategy.verification;
-import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration2.Configuration;
+ import org.apache.commons.configuration.MapConfiguration;
import org.apache.tinkerpop.gremlin.process.traversal.Step;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.step.Parameterizing;