Yesterday I flubbed a merge from tp31 to master. I know exactly what I did and the merge was not all that complicated so luckily it was quite easy to resolve. The only thing that possibly remains amiss are these two lines in the spark-gremlin pom.xml:
https://github.com/apache/incubator-tinkerpop/blob/bbf6b19cdd62952a086cf6902847a3352e107bd9/spark-gremlin/pom.xml#L413-L414 These two lines were in tp31 but not in master at the time of this merge. They are now in master and i'm not sure if they should be. Marko, as this is spark related, I assume that you would know whether they should be only in tp31 or not - if so, let me know and I'll remove them from master. Thanks, Stephen
