GitHub user spmallette opened a pull request:

    https://github.com/apache/tinkerpop/pull/492

    TINKERPOP-1538 [tp32]

    See #491
    
    Had to do a separate PR as the merge from tp31 was not clean. Required 
additional changes for tests to pass.
    
    VOTE +1

You can merge this pull request into a Git repository by running:

    $ git pull https://github.com/apache/tinkerpop TINKERPOP-1538-tp32

Alternatively you can review and apply these changes as the patch at:

    https://github.com/apache/tinkerpop/pull/492.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

    This closes #492
    
----
commit 569753e3be41828887cdfa8085d4744ff955bb0d
Author: Stephen Mallette <[email protected]>
Date:   2016-11-13T14:03:13Z

    TINKERPOP-1538 Use non-default port for gremlin server tests
    
    Used something other than 8182 to run the gremlin server tests to avoid 
port conflicts if gremlin server happens to be running in the background.

commit 8818db4754dc6bbac7dc0f5a7ac4f40ab1386341
Author: Stephen Mallette <[email protected]>
Date:   2016-11-13T21:54:32Z

    Merge branch 'TINKERPOP-1538' into TINKERPOP-1538-tp32
    
    Conflicts:
        
gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java
        
gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java
        
gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerSessionIntegrateTest.java
        
gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/server/gremlin-server-integration.yaml
        
gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/server/gremlin-server-performance.yaml

commit 3bc691119212846980a23aafb9133fef6269e911
Author: Stephen Mallette <[email protected]>
Date:   2016-11-14T00:40:19Z

    TINKERPOP-1538 Fixed handling of pass-thru configs for 
DriverRemoteConnection
    
    Used non-standard port for tests.

----


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---

Reply via email to