Merge branch 'TINKERPOP-1495'

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

Branch: refs/heads/master
Commit: 173d823a9ccdbaf1254a36b8172c8ee0c2734478
Parents: a8da47f 85eebfa
Author: Marko A. Rodriguez <okramma...@gmail.com>
Authored: Wed Oct 12 07:09:35 2016 -0600
Committer: Marko A. Rodriguez <okramma...@gmail.com>
Committed: Wed Oct 12 07:09:35 2016 -0600

----------------------------------------------------------------------
 CHANGELOG.asciidoc                              |  3 ++
 .../computer/traversal/MasterExecutor.java      |  4 +-
 .../computer/traversal/WorkerExecutor.java      |  4 +-
 .../process/traversal/step/GraphComputing.java  | 29 ++++++++++++
 .../traversal/step/branch/RepeatStep.java       |  1 +
 .../traversal/step/filter/DedupGlobalStep.java  | 12 ++++-
 .../step/filter/GroovyDedupTest.groovy          | 11 ++++-
 .../traversal/step/filter/DedupTest.java        | 48 ++++++++++++++++++--
 8 files changed, 103 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/173d823a/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --cc CHANGELOG.asciidoc
index 81f23c6,17cd3b7..a97a32c
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@@ -26,8 -26,9 +26,11 @@@ image::https://raw.githubusercontent.co
  TinkerPop 3.2.3 (Release Date: NOT OFFICIALLY RELEASED YET)
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  
 +* Increased performance of `CredentialGraph` authentication
 +* Removed Java 8 stream usage from `TraversalHelper` for performance reasons.
+ * Fixed a bug in `RepeatStep` where `emit().as('x')` wasn't adding the step 
labels to the emit-traverser.
+ * Added `GraphComputing.atMaster(boolean)` to allow steps to know whether 
they are executing at master or distributed at workers.
+ * Fixed a bug in OLAP where `DedupGlobalStep` wasn't de-duping local master 
traversers.
  * Added `HasContainerHolder.removeHasContainer()`-method with default 
`UnsupportedOperationException` implementation.
  * `TraversalSource.withComputer()` is simplified to add a 
`VertexProgramStrategy`. Easier for language variants.
  * Fixed a `Set`, `List`, `Map` bug in the various `Translators` where such 
collections were not being internally translated.

Reply via email to