Merge remote-tracking branch 'origin/tp31' Conflicts: CHANGELOG.asciidoc
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/7c585e0c Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/7c585e0c Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/7c585e0c Branch: refs/heads/TINKERPOP-1331 Commit: 7c585e0cefaab3051efc1fd05bb95ff2d641a67e Parents: 2f1dc3e 1f0c34f Author: Stephen Mallette <sp...@genoprime.com> Authored: Wed Jun 8 07:33:25 2016 -0400 Committer: Stephen Mallette <sp...@genoprime.com> Committed: Wed Jun 8 07:33:25 2016 -0400 ---------------------------------------------------------------------- CHANGELOG.asciidoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/7c585e0c/CHANGELOG.asciidoc ----------------------------------------------------------------------