Merge branch 'tp31'
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/bf225b8c Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/bf225b8c Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/bf225b8c Branch: refs/heads/master Commit: bf225b8cc6a75e1a7781cb41bb2dd9f368b1ae70 Parents: cc0c06f 4443dcf Author: Marko A. Rodriguez <[email protected]> Authored: Fri Aug 12 08:14:10 2016 -0600 Committer: Marko A. Rodriguez <[email protected]> Committed: Fri Aug 12 08:14:10 2016 -0600 ---------------------------------------------------------------------- CHANGELOG.asciidoc | 1 + .../gremlin/structure/util/star/StarGraph.java | 17 ++++++++++------- 2 files changed, 11 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/bf225b8c/CHANGELOG.asciidoc ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/bf225b8c/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/star/StarGraph.java ---------------------------------------------------------------------- diff --cc gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/star/StarGraph.java index 73c7ca7,2089c42..90c02ff --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/star/StarGraph.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/star/StarGraph.java @@@ -38,9 -37,9 +38,10 @@@ import org.apache.tinkerpop.gremlin.uti import java.io.Serializable; import java.util.ArrayList; + import java.util.Arrays; import java.util.Collections; import java.util.HashMap; +import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.Map;
