Merge remote-tracking branch 'origin/master' into TINKERPOP-1278
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/4cfcb2bd Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/4cfcb2bd Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/4cfcb2bd Branch: refs/heads/TINKERPOP-1278 Commit: 4cfcb2bdeddd88e1ac45eb4220f94e7fa5e48265 Parents: 250c421 2f2b373 Author: Stephen Mallette <[email protected]> Authored: Tue Jul 26 11:27:53 2016 -0400 Committer: Stephen Mallette <[email protected]> Committed: Tue Jul 26 11:27:53 2016 -0400 ---------------------------------------------------------------------- CHANGELOG.asciidoc | 7 +++ .../tinkerpop/gremlin/server/handler/Frame.java | 11 +++++ .../gremlin/server/op/AbstractOpProcessor.java | 46 ++++++++++++-------- 3 files changed, 47 insertions(+), 17 deletions(-) ----------------------------------------------------------------------
