[tinkerpop] 01/01: Merge remote-tracking branch 'origin/revert_tinkerpop-2289' into travis-fix

[sp...@apache.org]

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

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

commit f4a04d155c4facc1e462494f32c416394d345347
Merge: 00c15c0 b5b48a4
Author: stephen <sp...@gmail.com>
AuthorDate: Sat Nov 9 08:35:39 2019 -0500

    Merge remote-tracking branch 'origin/revert_tinkerpop-2289' into travis-fix

 CHANGELOG.asciidoc                                 |  1 +
 gremlin-driver/pom.xml                             | 18 ---------
 .../apache/tinkerpop/gremlin/driver/Cluster.java   | 24 ++++-------
 .../org/apache/tinkerpop/gremlin/driver/Host.java  |  3 +-
 .../apache/tinkerpop/gremlin/driver/HostTest.java  | 46 +---------------------
 5 files changed, 11 insertions(+), 81 deletions(-)

diff --cc CHANGELOG.asciidoc
index 1fdcfc0,edc4b9b..45bda6a
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@@ -485,8 -23,8 +485,9 @@@ image::https://raw.githubusercontent.co
  [[release-3-3-10]]
  === TinkerPop 3.3.10 (Release Date: NOT OFFICIALLY RELEASED YET)
  
 +* Bump to Tornado 5.x for gremlin-python.
  * Deprecated `TraversalStrategies.applyStrategies()`.
+ * Reverted: Modified Java driver to use IP address rather than hostname to create connections.
  
  [[release-3-3-9]]
  === TinkerPop 3.3.9 (Release Date: October 14, 2019)