Merge branch 'origin/tp31' into TINKERPOP-1360

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

Branch: refs/heads/TINKERPOP-1360
Commit: 2b2ba899495ee4a4e274931bb84341c4a9d4f2d8
Parents: 3067796 168097b
Author: Jason Plurad <[email protected]>
Authored: Sat Jul 30 10:39:44 2016 -0400
Committer: Jason Plurad <[email protected]>
Committed: Sat Jul 30 10:40:15 2016 -0400

----------------------------------------------------------------------
 CHANGELOG.asciidoc                              | 57 ++++++++++++++++++-
 README.asciidoc                                 |  2 +-
 bin/publish-docs.sh                             |  2 +-
 bin/validate-distribution.sh                    | 18 +++---
 docs/javadoc/overview.html                      |  2 +-
 docs/src/dev/developer/administration.asciidoc  |  5 --
 docs/src/dev/developer/contributing.asciidoc    |  4 +-
 docs/src/dev/developer/for-committers.asciidoc  | 18 +++---
 docs/src/dev/developer/release.asciidoc         | 59 +++++++-------------
 docs/src/reference/acknowledgements.asciidoc    |  8 ---
 .../tutorials/getting-started/index.asciidoc    |  4 +-
 .../upgrade/release-3.0.x-incubating.asciidoc   |  8 +--
 .../upgrade/release-3.1.x-incubating.asciidoc   | 12 ++--
 giraph-gremlin/pom.xml                          |  2 +-
 .../gremlin-archetype-server/pom.xml            |  2 +-
 .../archetype-resources/README.asciidoc         |  2 +-
 .../gremlin-archetype-tinkergraph/pom.xml       |  2 +-
 gremlin-archetype/pom.xml                       |  2 +-
 gremlin-console/pom.xml                         |  2 +-
 gremlin-core/pom.xml                            |  2 +-
 gremlin-driver/pom.xml                          |  2 +-
 gremlin-groovy-test/pom.xml                     |  2 +-
 gremlin-groovy/pom.xml                          |  2 +-
 .../groovy/util/DependencyGrabberTest.java      |  4 --
 gremlin-server/pom.xml                          |  2 +-
 .../tinkerpop/gremlin/server/handler/Frame.java | 11 ++++
 .../server/op/AbstractEvalOpProcessor.java      | 45 +++++++++------
 gremlin-server/src/main/static/LICENSE          | 22 ++++----
 gremlin-shaded/pom.xml                          |  2 +-
 gremlin-test/pom.xml                            |  2 +-
 hadoop-gremlin/pom.xml                          |  2 +-
 neo4j-gremlin/pom.xml                           |  2 +-
 pom.xml                                         |  8 +--
 spark-gremlin/pom.xml                           |  2 +-
 tinkergraph-gremlin/pom.xml                     |  2 +-
 .../structure/TinkerGraphPlayTest.java          |  2 +-
 36 files changed, 181 insertions(+), 144 deletions(-)
----------------------------------------------------------------------


Reply via email to