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 213e5f442f262ed67e583b5351863620b093a820
Merge: 33149a9103 ed4470315b
Author: Stephen Mallette <[email protected]>
AuthorDate: Thu Jul 21 15:37:34 2022 -0400

    Merge branch '3.6-dev'

 CHANGELOG.asciidoc                      | 26 ++++++++++++++++++++++++--
 docs/src/dev/developer/release.asciidoc |  8 +++++++-
 docs/src/upgrade/release-3.6.x.asciidoc |  2 +-
 hadoop-gremlin/pom.xml                  |  7 +++++++
 spark-gremlin/pom.xml                   |  9 ++++++++-
 5 files changed, 47 insertions(+), 5 deletions(-)

diff --cc CHANGELOG.asciidoc
index 64dca47856,4eb8b2e1e6..612d402f62
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@@ -16,21 -16,12 +16,21 @@@ limitations under the License
  ////
  = TinkerPop3 CHANGELOG
  
 -== TinkerPop 3.6.0 (Tinkerheart)
 +== TinkerPop 3.7.0 (NOT OFFICIALLY NAMED YET)
  
 
-image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/images/gremlin-victorian.png[width=185]
 
+image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/images/gremlin-standing.png[width=185]
 +
 +[[release-3-7.0]]
 +=== TinkerPop 3.7.0 (Release Date: NOT OFFICIALLY RELEASED YET)
 +
 +This release also includes changes from <<release-3-6-XXX, 3.6.XXX>>.
 +
 +* Removed `connectOnStartup` configuration option from gremlin-javascript.
 +* Changed `Gremlin.version()` to read from the more specificly named 
`tinkerpop-version` attribute.
 +* Added warning on vertex property cardinality mismatch when reading GraphML.
  
  [[release-3-6-1]]
- === TinkerPop 3.6.1 (Release Date: NOT OFFICIALLY RELEASED YET)
+ === TinkerPop 3.6.1 (Release Date: July 18, 2022)
  
  This release also includes changes from <<release-3-5-4, 3.5.4>>.
  

Reply via email to