You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2016/08/08 11:57:53 UTC
[3/3] tinkerpop git commit: Merge remote-tracking branch 'origin/tp31'
Merge remote-tracking branch 'origin/tp31'
Conflicts:
docs/src/dev/developer/development-environment.asciidoc
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/19d2eee1
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/19d2eee1
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/19d2eee1
Branch: refs/heads/master
Commit: 19d2eee152a9cec02f09c32e5d4dee5f30f16f3f
Parents: 31f79ea 4571061
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Aug 8 07:57:36 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Aug 8 07:57:36 2016 -0400
----------------------------------------------------------------------
docs/src/dev/developer/development-environment.asciidoc | 2 +-
docs/src/dev/developer/for-committers.asciidoc | 4 ++--
docs/src/dev/developer/release.asciidoc | 8 ++++----
docs/src/tutorials/getting-started/index.asciidoc | 12 ++++++------
gremlin-console/bin/gremlin.sh | 4 ++--
gremlin-driver/pom.xml | 2 +-
6 files changed, 16 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/19d2eee1/docs/src/dev/developer/development-environment.asciidoc
----------------------------------------------------------------------
diff --cc docs/src/dev/developer/development-environment.asciidoc
index 23df9ee,2369133..da6dc16
--- a/docs/src/dev/developer/development-environment.asciidoc
+++ b/docs/src/dev/developer/development-environment.asciidoc
@@@ -41,7 -41,7 +41,7 @@@ mvn -Dmaven.javadoc.skip=true --project
** Build AsciiDocs (but don't evaluate code blocks): `bin/process-docs.sh --dryRun`
** Build AsciiDocs (but don't evaluate code blocks in specific files): `bin/process-docs.sh --dryRun docs/src/reference/the-graph.asciidoc,docs/src/tutorial/getting-started,...`
** Build AsciiDocs (but evaluate code blocks only in specific files): `bin/process-docs.sh --fullRun docs/src/reference/the-graph.asciidoc,docs/src/tutorial/getting-started,...`
- ** Process a single AsciiDoc file: +pass:[docs/preprocessor/preprocess-file.sh `pwd`/gremlin-console/target/apache-gremlin-console-*-standalone "" "*" `pwd`/docs/src/xyz.asciidoc]+
-** Process a single AsciiDoc file: +pass:[docs/preprocessor/preprocess-file.sh `pwd`/gremlin-console/target/apache-tinkerpop-gremlin-console-*-standalone `pwd`/docs/src/xyz.asciidoc]+
++** Process a single AsciiDoc file: +pass:[docs/preprocessor/preprocess-file.sh `pwd`/gremlin-console/target/apache-tinkerpop-gremlin-console-*-standalone "" "*" `pwd`/docs/src/xyz.asciidoc]+
* Build JavaDocs: `mvn process-resources -Djavadoc`
* Check for Apache License headers: `mvn apache-rat:check`
* Check for newer dependencies: `mvn versions:display-dependency-updates` or `mvn versions:display-plugin-updates`
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/19d2eee1/docs/src/dev/developer/for-committers.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/19d2eee1/docs/src/tutorials/getting-started/index.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/19d2eee1/gremlin-driver/pom.xml
----------------------------------------------------------------------