[33/50] tinkerpop git commit: updated CHANGELOG

[sp...@apache.org]

updated CHANGELOG


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

Branch: refs/heads/TINKERPOP-1063
Commit: 1f0c34fa656a141db02104b55e4d73c1642086f7
Parents: 9f403ae
Author: Jason Plurad <pl...@us.ibm.com>
Authored: Wed Jun 8 01:11:30 2016 -0400
Committer: Jason Plurad <pl...@us.ibm.com>
Committed: Wed Jun 8 01:11:30 2016 -0400

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


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1f0c34fa/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`.