[21/50] tinkerpop git commit: Merge branch 'tp33'

Merge branch 'tp33' Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/fb14324f Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/fb14324f Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/fb14324f

[21/50] tinkerpop git commit: Merge branch 'tp33'

Merge branch 'tp33' Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/e1e15fa1 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/e1e15fa1 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/e1e15fa1

[21/50] tinkerpop git commit: Merge branch 'tp33'

Merge branch 'tp33' Conflicts: giraph-gremlin/src/test/resources/log4j-silent.properties giraph-gremlin/src/test/resources/log4j-test.properties hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/HadoopGraphProvider.java Project:

[21/50] tinkerpop git commit: Merge branch 'tp33'

Merge branch 'tp33' Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/b5600e77 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/b5600e77 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/b5600e77