Merge branch 'tp32' into tp33

Conflicts:
        
gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/3797c7d6
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/3797c7d6
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/3797c7d6

Branch: refs/heads/master
Commit: 3797c7d6dac97d94f27faa8cbda31540b74d2539
Parents: 53c84bd f38c2bb
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Mar 12 08:30:41 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Mar 12 08:30:41 2018 -0400

----------------------------------------------------------------------
 .../Gherkin/GherkinTestRunner.cs                        |  5 -----
 gremlin-test/features/sideEffect/Sack.feature           | 12 ++++++------
 2 files changed, 6 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3797c7d6/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
----------------------------------------------------------------------
diff --cc 
gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
index 08693b2,9d0f15d..cff0858
--- 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
+++ 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
@@@ -40,13 -40,6 +40,8 @@@ namespace Gremlin.Net.IntegrationTest.G
          private static readonly IDictionary<string, IgnoreReason> 
IgnoredScenarios =
              new Dictionary<string, IgnoreReason>
              {
 +                { "g_V_valueMapXtrueX", 
IgnoreReason.TraversalTDeserializationNotSupported },   // TINKERPOP-1866
 +                { "g_V_valueMapXtrue_name_ageX", 
IgnoreReason.TraversalTDeserializationNotSupported }, // TINKERPOP-1866
-                 {
-                     
"g_withSackX1_sumX_VX1X_localXoutXknowsX_barrierXnormSackXX_inXknowsX_barrier_sack",
-                     IgnoreReason.NumericalValuesHaveWrongTypes
-                 },
-                 {"g_withBulkXfalseX_withSackX1_sumX_V_out_barrier_sack", 
IgnoreReason.NumericalValuesHaveWrongTypes},
                  {"g_V_hasIdXwithinXemptyXX_count", 
IgnoreReason.PWithinWrapsArgumentsInArray},
                  {"g_VX1X_out_aggregateXxX_out_whereXnotXwithinXaXXX", 
IgnoreReason.PWithinWrapsArgumentsInArray},
                  {

Reply via email to