Merge branch 'tp32' into tp33
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/31f509de Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/31f509de Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/31f509de Branch: refs/heads/master Commit: 31f509debdf64aba975dc08e3fd4896282f5e8c6 Parents: 69d46f7 5f770b1 Author: Stephen Mallette <sp...@genoprime.com> Authored: Thu Aug 16 15:10:24 2018 -0400 Committer: Stephen Mallette <sp...@genoprime.com> Committed: Thu Aug 16 15:10:24 2018 -0400 ---------------------------------------------------------------------- CHANGELOG.asciidoc | 1 + .../archetype-resources/README.asciidoc | 6 ++-- .../archetype-resources/src/main/java/App.java | 1 + .../src/main/java/Service.java | 34 +++++++++----------- .../src/test/java/ServiceTest.java | 2 +- 5 files changed, 21 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/31f509de/CHANGELOG.asciidoc ----------------------------------------------------------------------