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/936fbf2a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/936fbf2a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/936fbf2a

Branch: refs/heads/graphml-no-edge-label
Commit: 936fbf2a4cafc80353f8cf538440700aeda2b0d4
Parents: b38a50a
Author: Jason Plurad <plur...@us.ibm.com>
Authored: Wed Jun 8 01:11:30 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Jun 8 16:24:33 2016 -0400

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


http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/936fbf2a/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index b6235e2..10f91a0 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -26,6 +26,7 @@ 
image::https://raw.githubusercontent.com/apache/incubator-tinkerpop/master/docs/
 TinkerPop 3.1.3 (NOT OFFICIALLY RELEASED YET)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
+* Avoid 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`.

Reply via email to