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/06/16 19:33:56 UTC
[26/50] tinkerpop git commit: Merge remote-tracking branch
'origin/TINKERPOP-1196' into tp31
Merge remote-tracking branch 'origin/TINKERPOP-1196' into tp31
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/2907ff81
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/2907ff81
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/2907ff81
Branch: refs/heads/TINKERPOP-1063
Commit: 2907ff812cbcc98637d30d586cac8b1ac2a27149
Parents: f7e7df0 3f85775
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Jun 7 10:29:37 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Jun 7 10:29:37 2016 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
.../tinkerpop/gremlin/driver/ResultQueue.java | 86 +++++++++-----------
.../tinkerpop/gremlin/driver/ResultSet.java | 6 +-
3 files changed, 39 insertions(+), 54 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2907ff81/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --cc CHANGELOG.asciidoc
index 601022a,cb183a6..8e0dd0e
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@@ -26,10 -26,9 +26,11 @@@ image::https://raw.githubusercontent.co
TinkerPop 3.1.3 (NOT OFFICIALLY RELEASED YET)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+* Fixed a bug where timeout functions provided to the `GremlinExecutor` were not executing in the same thread as the script evaluation.
+* Optimized a few special cases in `RangeByIsCountStrategy`.
* Named the thread pool used by Gremlin Server sessions: "gremlin-server-session-$n".
* Fixed a bug in `BulkSet.equals()` which made itself apparent when using `store()` and `aggregate()` with labeled `cap()`.
+ * Fixed a bug where `Result.one()` could potentially block indefinitely under certain circumstances.
* Ensured that all asserts of vertex and edge counts were being applied properly in the test suite.
* Fixed bug in `gremlin-driver` where certain channel-level errors would not allow the driver to reconnect.
* `SubgraphStep` now consults the parent graph features to determine cardinality of a property.