[tinkerpop] branch master updated (0c382bb7ec -> a883a0e973)

[sp...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

spmallette pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git


    from 0c382bb7ec Merge branch '3.6-dev'
     add a6c53350a3 TINKERPOP-2865 Inject partition steps after last has in chain
     add e6e07d6acf Merge branch 'TINKERPOP-2865' into 3.5-dev
     add e87775d3e6 Merge branch '3.5-dev' into 3.6-dev
     new a883a0e973 Merge branch '3.6-dev'

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 CHANGELOG.asciidoc                                 |  3 +-
 .../strategy/decoration/PartitionStrategy.java     | 24 ++++++++++----
 .../strategy/decoration/PartitionStrategyTest.java | 37 +++++++++++++++++++---
 3 files changed, 53 insertions(+), 11 deletions(-)

[tinkerpop] 01/01: Merge branch '3.6-dev'

[sp...@apache.org]

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 a883a0e973faf101be8cd1684abb946692837ee7
Merge: 0c382bb7ec e87775d3e6
Author: Stephen Mallette <st...@amazon.com>
AuthorDate: Fri Feb 10 09:00:43 2023 -0500

    Merge branch '3.6-dev'

 CHANGELOG.asciidoc                                 |  3 +-
 .../strategy/decoration/PartitionStrategy.java     | 24 ++++++++++----
 .../strategy/decoration/PartitionStrategyTest.java | 37 +++++++++++++++++++---
 3 files changed, 53 insertions(+), 11 deletions(-)

diff --cc gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/PartitionStrategyTest.java
index a767708d15,c5d4d7e5c9..bacf05bc32
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/PartitionStrategyTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/PartitionStrategyTest.java
@@@ -46,7 -47,9 +47,10 @@@ import java.util.ArrayList
  import java.util.Arrays;
  import java.util.List;
  
+ import static org.hamcrest.core.IsInstanceOf.instanceOf;
+ import static org.hamcrest.core.IsIterableContaining.hasItem;
+ import static org.hamcrest.core.IsNot.not;
 +import static org.hamcrest.core.IsIterableContaining.hasItem;
  import static org.junit.Assert.assertEquals;
  import static org.hamcrest.MatcherAssert.assertThat;
  import static org.junit.Assert.fail;