[35/50] [abbrv] incubator-tinkerpop git commit: updated CHANGELOG

[dk...@apache.org]

updated CHANGELOG


Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/2f1dc3ea
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/2f1dc3ea
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/2f1dc3ea

Branch: refs/heads/TINKERPOP-1331
Commit: 2f1dc3ea8eec2a98c415666591e6657a3eca50c1
Parents: 8083819
Author: Jason Plurad <pl...@us.ibm.com>
Authored: Wed Jun 8 01:18:45 2016 -0400
Committer: Jason Plurad <pl...@us.ibm.com>
Committed: Wed Jun 8 01:18:45 2016 -0400

----------------------------------------------------------------------
 CHANGELOG.asciidoc | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/2f1dc3ea/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index c9f6692..d530f9e 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -249,6 +249,8 @@ image::https://raw.githubusercontent.com/apache/incubator-tinkerpop/master/docs/
 TinkerPop 3.1.3 (NOT OFFICIALLY RELEASED YET)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
+* Avoided hamcrest conflict by using mockito-core instead of mockito-all dependency in `gremlin-test`.
+* Fixed bug in `IoGraphTest` causing IllegalArgumentException: URI is not hierarchical error for external graph implementations.
 * 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".