You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by ok...@apache.org on 2016/02/09 22:12:01 UTC
[09/11] incubator-tinkerpop git commit: merged from tp31 and fix
conflicts.
merged from tp31 and fix conflicts.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/26aedc74
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/26aedc74
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/26aedc74
Branch: refs/heads/TINKERPOP-971
Commit: 26aedc746fd1bed726e73d8ca2b6063307777d5c
Parents: e8a7e3a b07400c
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Tue Feb 9 10:14:47 2016 -0700
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Tue Feb 9 10:14:47 2016 -0700
----------------------------------------------------------------------
CHANGELOG.asciidoc | 7 ++
docs/src/dev/developer/release.asciidoc | 67 ++++++------
.../process/computer/GiraphComputation.java | 3 +-
.../computer/traversal/TraverserExecutor.java | 101 +++++++++++--------
.../traversal/step/map/CountGlobalStep.java | 21 +++-
.../traversal/step/map/GroupCountStep.java | 16 +--
.../process/traversal/step/map/GroupStep.java | 10 +-
.../traversal/step/map/GroupStepV3d0.java | 10 +-
.../traversal/step/map/MaxGlobalStep.java | 23 +++--
.../traversal/step/map/MinGlobalStep.java | 22 ++--
.../traversal/step/map/SumGlobalStep.java | 23 +++--
.../process/traversal/step/map/TreeStep.java | 10 --
.../step/util/ReducingBarrierStep.java | 50 ++++-----
.../gremlin/util/iterator/DoubleIterator.java | 12 ++-
.../gremlin/util/iterator/IteratorUtils.java | 39 ++++++-
.../gremlin/util/iterator/MultiIterator.java | 2 +-
.../gremlin/util/iterator/SingleIterator.java | 9 +-
pom.xml | 12 ++-
.../process/computer/TinkerMessenger.java | 13 +--
19 files changed, 276 insertions(+), 174 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/26aedc74/CHANGELOG.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/26aedc74/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 91f515a,0a26050..955cef5
--- a/pom.xml
+++ b/pom.xml
@@@ -742,7 -742,7 +742,8 @@@ limitations under the License
<configuration>
<sourceDirectory>${asciidoc.input.dir}/tutorials/getting-started</sourceDirectory>
<sourceDocumentName>index.asciidoc</sourceDocumentName>
-- <outputDirectory>${htmlsingle.output.dir}/tutorials/getting-started</outputDirectory>
++ <outputDirectory>${htmlsingle.output.dir}/tutorials/getting-started
++ </outputDirectory>
<backend>html5</backend>
<doctype>article</doctype>
<attributes>
@@@ -762,9 -762,9 +763,11 @@@
<goal>process-asciidoc</goal>
</goals>
<configuration>
-- <sourceDirectory>${asciidoc.input.dir}/tutorials/the-gremlin-console</sourceDirectory>
++ <sourceDirectory>${asciidoc.input.dir}/tutorials/the-gremlin-console
++ </sourceDirectory>
<sourceDocumentName>index.asciidoc</sourceDocumentName>
-- <outputDirectory>${htmlsingle.output.dir}/tutorials/the-gremlin-console</outputDirectory>
++ <outputDirectory>${htmlsingle.output.dir}/tutorials/the-gremlin-console
++ </outputDirectory>
<backend>html5</backend>
<doctype>article</doctype>
<attributes>
@@@ -954,7 -954,7 +957,8 @@@
<artifactId>maven-surefire-plugin</artifactId>
<version>2.17</version>
<configuration>
-- <argLine>-Dlog4j.configuration=${log4j-silent.properties} -Dbuild.dir=${project.build.directory}
++ <argLine>-Dlog4j.configuration=${log4j-silent.properties}
++ -Dbuild.dir=${project.build.directory}
</argLine>
<excludes>
<exclude>**/*IntegrateTest.java</exclude>