Merge branch 'master' into TINKERPOP-1389
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/a0ce3178 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/a0ce3178 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/a0ce3178 Branch: refs/heads/TINKERPOP-1389 Commit: a0ce3178efd6a3f0602e19a8d6c6773796ed021a Parents: 3ed9aee 42090f2 Author: Marko A. Rodriguez <[email protected]> Authored: Mon Oct 24 15:47:28 2016 -0600 Committer: Marko A. Rodriguez <[email protected]> Committed: Mon Oct 24 15:47:28 2016 -0600 ---------------------------------------------------------------------- CHANGELOG.asciidoc | 4 ++-- .../traversal/strategy/decoration/VertexProgramStrategy.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a0ce3178/CHANGELOG.asciidoc ----------------------------------------------------------------------
