removed section missed in merge conflict
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/8ed3c950 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/8ed3c950 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/8ed3c950 Branch: refs/heads/TINKERPOP-1278 Commit: 8ed3c9506ea2de0b0e4a96f045d8eac66c465146 Parents: 3c9cf05 Author: Robert Dale <robd...@gmail.com> Authored: Wed Jul 27 14:24:21 2016 -0400 Committer: Robert Dale <robd...@gmail.com> Committed: Wed Jul 27 14:24:21 2016 -0400 ---------------------------------------------------------------------- docs/src/reference/the-traversal.asciidoc | 20 -------------------- 1 file changed, 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8ed3c950/docs/src/reference/the-traversal.asciidoc ---------------------------------------------------------------------- diff --git a/docs/src/reference/the-traversal.asciidoc b/docs/src/reference/the-traversal.asciidoc index e897810..f300e98 100644 --- a/docs/src/reference/the-traversal.asciidoc +++ b/docs/src/reference/the-traversal.asciidoc @@ -1292,26 +1292,6 @@ path.c path.d == path.e ---- -<<<<<<< HEAD -======= -[[peerpressure-step]] -PeerPressure Step -~~~~~~~~~~~~~~~~~ - -The `peerPressure()`-step (*map*/*sideEffect*) clusters vertices using <<peerpressurevertexprogram,`PeerPressureVertexProgram`>>. - -IMPORTANT: The `peerPressure()`-step is a `VertexComputing`-step and as such, can only be used against a graph that supports `GraphComputer` (OLAP). - -[gremlin-groovy,modern] ----- -g = graph.traversal().withComputer() -g.V().peerPressure().by('cluster').values('cluster') -g.V().hasLabel('person'). - peerPressure().by('cluster'). - group().by('cluster').by('name') ----- - ->>>>>>> deb99f6... minor word and link cleanup [[profile-step]] Profile Step ~~~~~~~~~~~~
