tinkerpop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From spmalle...@apache.org
Subject [45/50] tinkerpop git commit: Merge branch 'tp31' into tp32
Date Thu, 06 Apr 2017 11:46:35 GMT
Merge branch 'tp31' into tp32


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

Branch: refs/heads/TINKERPOP-1577
Commit: a4a646d680261a3e169962bbf016ef323ac8cd2d
Parents: 91802ad beb7f74
Author: Robert Dale <robdale@gmail.com>
Authored: Thu Mar 30 10:34:30 2017 -0400
Committer: Robert Dale <robdale@gmail.com>
Committed: Thu Mar 30 10:34:30 2017 -0400

----------------------------------------------------------------------
 .gitignore                                    | 1 +
 docker/scripts/build.sh                       | 7 +++++++
 docs/src/reference/the-graphcomputer.asciidoc | 1 +
 3 files changed, 9 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a4a646d6/.gitignore
----------------------------------------------------------------------
diff --cc .gitignore
index 33fb239,a4c1cdc..ca3160b
--- a/.gitignore
+++ b/.gitignore
@@@ -14,9 -14,5 +14,10 @@@ _bsp
  doc/out
  docs/*.asciidoc
  ext/
 +benchmarks/
 +*$py.class
 +__pycache__/
 +*.py[cdo]
 +__version__.py
  .glv
+ settings.xml

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a4a646d6/docs/src/reference/the-graphcomputer.asciidoc
----------------------------------------------------------------------
diff --cc docs/src/reference/the-graphcomputer.asciidoc
index e4dff50,ef859f9..b03c891
--- a/docs/src/reference/the-graphcomputer.asciidoc
+++ b/docs/src/reference/the-graphcomputer.asciidoc
@@@ -313,8 -278,9 +313,9 @@@ public class PageRankVertexProgram impl
  
      @Override
      public String toString() {
 -        return StringFactory.vertexProgramString(this, "alpha=" + this.alpha + ",iterations="
+ this.totalIterations);
 +        return StringFactory.vertexProgramString(this, "alpha=" + this.alpha + ", iterations="
+ this.totalIterations);
      }
+ }
  ----
  
  <1> `PageRankVertexProgram` implements `VertexProgram<Double>` because the messages
it sends are Java doubles.


Mime
View raw message