Merge remote-tracking branch 'origin/tp31'
Conflicts:
gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PropertiesTest.java
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/c1b4dae3
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/c1b4dae3
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/c1b4dae3
Branch: refs/heads/TINKERPOP-1274
Commit: c1b4dae383db3daebb138fa9b9d9fcdabf3af1c9
Parents: 842a58f 2c835c3
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Jun 15 09:00:52 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Jun 15 09:00:52 2016 -0400
----------------------------------------------------------------------
.../main/java/org/apache/tinkerpop/gremlin/driver/ResultQueue.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
