[tinkerpop] 01/03: Merge branch 'TINKERPOP-2365' into 3.3-dev

[sp...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

spmallette pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit 4cc4d8f510e86ba30b86ccca6cfebdf4015caf32
Merge: e7995ef 1e2d7b8
Author: Stephen Mallette <sp...@genoprime.com>
AuthorDate: Fri May 8 12:56:14 2020 -0400

    Merge branch 'TINKERPOP-2365' into 3.3-dev

 CHANGELOG.asciidoc                                          |  4 +++-
 .../strategy/optimization/LazyBarrierStrategy.java          | 13 +++++++++----
 .../strategy/optimization/LazyBarrierStrategyTest.java      |  6 +++++-
 .../gremlin/process/traversal/step/map/ProfileTest.java     | 10 +++++++++-
 4 files changed, 26 insertions(+), 7 deletions(-)

diff --cc CHANGELOG.asciidoc
index 6c68ce4,4f2d06a..3fe4957
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@@ -33,8 -33,8 +33,10 @@@ image::https://raw.githubusercontent.co
  * Bumped to Jackson 2.9.10.4.
  * Remove invalid service descriptors from gremlin-shaded.
  * Fixed bug in Python and .NET traversal `clone()` where deep copies of bytecode were not occurring.
+ * Fixed bug in Python about integer serializer which was out of range of `g:Int32`.
+ * Fixed bug where `profile()` was forcing `LazyBarrierStrategy` to add an extra `barrier()` to the end of traversals.
 +* Fixed bug in Python about integer serializer which was out of range of `g:Int32`
- * Bump commons-codec 1.14
++* Bumped commons-codec 1.14
  
  [[release-3-3-10]]
  === TinkerPop 3.3.10 (Release Date: February 3, 2020)