Merge remote-tracking branch 'origin/TINKERPOP-1449'

Conflicts:
        CHANGELOG.asciidoc


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

Branch: refs/heads/TINKERPOP-1404
Commit: 8fc60ad455dcab11127f3b78158134aee6468123
Parents: cedbe9c a569ea8
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Sep 15 09:53:05 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Sep 15 09:53:05 2016 -0400

----------------------------------------------------------------------
 .gitignore                                      |  1 +
 CHANGELOG.asciidoc                              |  1 +
 docs/preprocessor/preprocess-file.sh            |  2 +-
 .../developer/development-environment.asciidoc  | 13 ++++-
 docs/src/dev/developer/release.asciidoc         | 16 +++---
 giraph-gremlin/pom.xml                          | 18 -------
 gremlin-console/pom.xml                         | 18 -------
 gremlin-groovy-test/pom.xml                     | 18 -------
 gremlin-groovy/pom.xml                          | 18 -------
 gremlin-python/pom.xml                          | 54 +++++---------------
 hadoop-gremlin/pom.xml                          | 18 -------
 neo4j-gremlin/pom.xml                           | 18 -------
 pom.xml                                         | 24 +++++++++
 spark-gremlin/pom.xml                           | 18 -------
 14 files changed, 62 insertions(+), 175 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8fc60ad4/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --cc CHANGELOG.asciidoc
index b359f37,ab2f8df..fd9255f
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@@ -28,7 -28,7 +28,8 @@@ TinkerPop 3.2.3 (Release Date: NOT OFFI
  
  * Fixed a `JavaTranslator` bug where `Bytecode` instructions were being 
mutated during translation.
  * Added `Path` to Gremlin-Python with respective GraphSON 2.0 deserializer.
 +* VertexPrograms can now declare traverser requirements, e.g. to have access 
to the path when used with `.program()`.
+ * New build options for `gremlin-python` where `-DglvPython` is no longer 
required.
  * Added missing `InetAddress` to GraphSON extension module.
  
  [[release-3-2-2]]

Reply via email to