Merge branch 'mp/1830-tinkergraph-index-race-condition' into tp32

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

Branch: refs/heads/master
Commit: fd6f6b4c21894ae527c0602db14be696ebd8a619
Parents: ac99e3c 7be8a0f
Author: Michael Pollmeier <mich...@michaelpollmeier.com>
Authored: Tue Nov 14 14:23:47 2017 +1300
Committer: Michael Pollmeier <mich...@michaelpollmeier.com>
Committed: Tue Nov 14 14:23:47 2017 +1300

----------------------------------------------------------------------
 CHANGELOG.asciidoc                                       |  1 +
 .../gremlin/tinkergraph/structure/TinkerIndex.java       | 11 +++++------
 2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


Reply via email to