Merge remote-tracking branch 'origin/tp31'
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/74127ca3 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/74127ca3 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/74127ca3 Branch: refs/heads/TINKERPOP-1274 Commit: 74127ca38c7d2d671f5829b128ec97feb5327951 Parents: b67db0c 84f2d63 Author: Stephen Mallette <[email protected]> Authored: Thu Jun 16 07:48:58 2016 -0400 Committer: Stephen Mallette <[email protected]> Committed: Thu Jun 16 07:48:58 2016 -0400 ---------------------------------------------------------------------- CHANGELOG.asciidoc | 1 + .../strategy/decoration/SubgraphStrategy.java | 40 ++++++++++++++------ .../decoration/SubgraphStrategyProcessTest.java | 22 +++++++++++ 3 files changed, 51 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/74127ca3/CHANGELOG.asciidoc ----------------------------------------------------------------------
