You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by dk...@apache.org on 2015/10/15 21:51:36 UTC

[04/11] incubator-tinkerpop git commit: Merge branch 'tp30' into TINKERPOP3-319

Merge branch 'tp30' into TINKERPOP3-319

Resolved Conflicts:
	CHANGELOG.asciidoc


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

Branch: refs/heads/master
Commit: ee4006b1e9689cab360de0d4a1eee111fb98f168
Parents: 808fc5c a28a1a8
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Tue Oct 13 22:11:51 2015 +0200
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Tue Oct 13 22:11:51 2015 +0200

----------------------------------------------------------------------
 CHANGELOG.asciidoc                              |   1 +
 CONTRIBUTING.asciidoc                           |  38 ++++-
 RELEASE.asciidoc                                |  24 +++-
 docs/src/gremlin-applications.asciidoc          |  25 ++++
 .../upgrade-release-3.0.x-incubating.asciidoc   | 141 +++++++++++++++++++
 docs/src/upgrade.asciidoc                       |  37 +++++
 .../step/sideEffect/TreeSideEffectStep.java     |   3 +-
 .../conf/gremlin-server-rest-secure.yaml        |  76 ++++++++++
 .../gremlin/server/channel/HttpChannelizer.java |  17 ++-
 .../handler/HttpBasicAuthenticationHandler.java |  37 +++--
 .../server/GremlinServerHttpIntegrateTest.java  |  34 ++++-
 .../process/traversal/step/filter/HasTest.java  |  32 +++--
 pom.xml                                         |  27 ++++
 13 files changed, 461 insertions(+), 31 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/ee4006b1/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --cc CHANGELOG.asciidoc
index 7a59b21,a635528..ab8d3c9
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@@ -25,7 -25,7 +25,8 @@@ image::https://raw.githubusercontent.co
  TinkerPop 3.0.2 (NOT OFFICIALLY RELEASED YET)
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  
 +* Made `BulkLoaderVertexProgram` work for any persistent TP3-supporting graph (input and output).
+ * `TreeSideEffectStep` now implements `PathProcessor` which fixed a `ComputerVerificationStrategy` issue.
  * Added a shell script that verifies source and binary distributions.
  * Fixed a bulk related bug in `GroupStep` when used on `GraphComputer` (OLAP).
  * Gremlin Server binary distribution now packages `tinkergraph-gremlin` and `gremlin-groovy` as plugins to be consistent with Gremlin Console's packaging.