You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2016/02/26 13:17:23 UTC
[13/19] incubator-tinkerpop git commit: Merge remote-tracking branch
'origin/TINKERPOP-1172' into tp31
Merge remote-tracking branch 'origin/TINKERPOP-1172' into tp31
Conflicts:
CHANGELOG.asciidoc
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/01b61715
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/01b61715
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/01b61715
Branch: refs/heads/master
Commit: 01b6171537789ec40c15b19ae8165d89d5903d2e
Parents: 7e4868e 37f3033
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Feb 25 09:24:47 2016 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Feb 25 09:24:47 2016 -0500
----------------------------------------------------------------------
CHANGELOG.asciidoc | 2 +
.../gremlin/driver/ConnectionPool.java | 7 +-
.../gremlin/driver/LoadBalancingStrategy.java | 10 +-
.../server/GremlinDriverIntegrateTest.java | 114 ++++++++++++-------
4 files changed, 86 insertions(+), 47 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/01b61715/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --cc CHANGELOG.asciidoc
index 6a57a60,37cee21..be419b2
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@@ -26,10 -26,8 +26,12 @@@ image::https://raw.githubusercontent.co
TinkerPop 3.1.2 (NOT OFFICIALLY RELEASED YET)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+* Bumped to Apache Groovy 2.4.6.
+* Added the `gremlin-archetype-server` archetype that demonstrates
+* Added the `gremlin-archetype-tinkergraph` archetype that demonstrates a basic project that uses TinkerGraph.
+* Added `gremlin-archetype` module to house TinkerPop "examples".
+ * Fixed a condition where `ConnectionPool` initialization in the driver would present a `NullPointerException` on initialization if there were errors constructing the pool in full.
+ * Fixed a bug in the round-robin load balancing strategy in the driver would waste requests potentially sending messages to dead hosts.
* Fixed a bug where multiple "close" requests were being sent by the driver on `Client.close()`.
* Fixed an `Property` attach bug that shows up in serialization-based `GraphComputer` implementations.
* Fixed a pom.xml bug where Gremlin Console/Server were not pulling the latest Neo4j 2.3.2.