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/06/13 19:37:39 UTC

[21/42] tinkerpop git commit: Merge remote-tracking branch 'origin/tp31'

Merge remote-tracking branch 'origin/tp31'

Conflicts:
	docs/src/dev/developer/contributing.asciidoc


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

Branch: refs/heads/TINKERPOP-1278
Commit: af98ba163651636f32f28b1b89a083284e2fb1ee
Parents: 7c585e0 2c092c8
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Jun 8 09:12:02 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Jun 8 09:12:02 2016 -0400

----------------------------------------------------------------------
 docs/src/dev/developer/contributing.asciidoc    | 471 +------------------
 .../developer/development-environment.asciidoc  |  98 ++++
 docs/src/dev/developer/for-committers.asciidoc  | 364 ++++++++++++++
 docs/src/dev/developer/index.asciidoc           |  12 +
 4 files changed, 476 insertions(+), 469 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/af98ba16/docs/src/dev/developer/index.asciidoc
----------------------------------------------------------------------