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/12 11:06:02 UTC
[2/2] tinkerpop git commit: Merge remote-tracking branch
'origin/TINKERPOP-1151'
Merge remote-tracking branch 'origin/TINKERPOP-1151'
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/c2503317
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/c2503317
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/c2503317
Branch: refs/heads/master
Commit: c25033175058aaec8973d9b7ad9bfe6f89e7b505
Parents: fc79de8 d0606ec
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Fri Aug 12 07:02:11 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri Aug 12 07:02:11 2016 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
.../upgrade/release-3.2.x-incubating.asciidoc | 40 +++++++++
.../main/resources/archetype-resources/pom.xml | 5 ++
gremlin-console/pom.xml | 11 +++
gremlin-core/pom.xml | 8 +-
gremlin-driver/pom.xml | 6 ++
gremlin-groovy/pom.xml | 7 ++
gremlin-server/pom.xml | 11 +++
.../gremlin/util/Log4jRecordingAppender.java | 66 +++++++++++++++
.../util/Log4jRecordingAppenderTest.java | 86 ++++++++++++++++++++
gremlin-test/pom.xml | 6 ++
.../gremlin/util/Log4jRecordingAppender.java | 66 ---------------
.../util/Log4jRecordingAppenderTest.java | 80 ------------------
pom.xml | 5 ++
14 files changed, 251 insertions(+), 147 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c2503317/CHANGELOG.asciidoc
----------------------------------------------------------------------