[35/50] [abbrv] tinkerpop git commit: Merge branch 'TINKERPOP-1385' into tp32

[sp...@apache.org]

Merge branch 'TINKERPOP-1385' into tp32

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/04d4e90a
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/04d4e90a
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/04d4e90a

Branch: refs/heads/TINKERPOP-1716
Commit: 04d4e90a66261b8dd3506cb16e947d7122d0458f
Parents: f161f7b d27fc7d
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Fri Jul 14 12:03:31 2017 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri Jul 14 12:03:31 2017 -0400

----------------------------------------------------------------------
 CHANGELOG.asciidoc                              |  1 +
 .../process/traversal/step/map/ProfileTest.java | 38 ++++++++++++++------
 2 files changed, 29 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/04d4e90a/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --cc CHANGELOG.asciidoc
index 7d491b6,05e20bb..f36fe33
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@@ -28,7 -28,7 +28,8 @@@ TinkerPop 3.2.6 (Release Date: NOT OFFI
  
  This release also includes changes from <<release-3-1-8, 3.1.8>>.
  
+ * `ProfileTest` is now less stringent about assertions which will reduce burdens on providers.
 +* `GremlinExecutor` begins timeout of script evaluation at the time the script was submitted and not from the time it began evaluation.
  * `ReferenceFactory` and `DetachedFactory` now detach elements in collections accordingly.
  * Deprecated the `useMapperFromGraph` configuration option for Gremlin Server serializers.
  * `JavaTranslator` is now smart about handling `BulkSet` and `Tree`.