[tinkerpop] 01/03: Merge branch 'pr-1235' into tp33

[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 67961283ed70635a1702320ec7298547a93168df
Merge: 5f36890 38ab69b
Author: stephen <sp...@gmail.com>
AuthorDate: Thu Jan 2 12:40:33 2020 -0500

    Merge branch 'pr-1235' into tp33

 CHANGELOG.asciidoc                                        |  1 +
 .../gremlin/structure/io/graphml/GraphMLReader.java       | 15 ++++++++++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --cc CHANGELOG.asciidoc
index ed51f12,f781a1a..429aa88
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@@ -23,17 -23,11 +23,18 @@@ image::https://raw.githubusercontent.co
  [[release-3-3-10]]
  === TinkerPop 3.3.10 (Release Date: NOT OFFICIALLY RELEASED YET)
  
 +* Improved error messaging for a `Cluster` with a bad `Channelizer` configuration in the Java driver.
 +* Made `Cluster` be able to open configuration file on resources directory.
 +* Implemented `Traversal.clone()` operations for all language variants.
  * Bump to Tornado 5.x for gremlin-python.
 +* Started keep-alive polling on `Connection` construction to ensure that a `Connection` doesn't die in the pool.
  * Deprecated `TraversalStrategies.applyStrategies()`.
  * Deprecated Jython support in `gremlin-python`.
 +* Deprecated `NioChannelizer` and related classes in `gremlin-driver` and `gremlin-server`.
 +* Fixed a bug in the `ClassCacheRequestCount` metric for `GremlinGroovyScriptEngine` which wasn't including the cache hit count, only the misses.
 +* Improved Gremlin Server executor thread handling on client close requests.
  * Reverted: Modified Java driver to use IP address rather than hostname to create connections.
+ * Allow custom XMLInputFactory to be used with GraphMLReader.
  
  [[release-3-3-9]]
  === TinkerPop 3.3.9 (Release Date: October 14, 2019)