[tinkerpop] 02/03: Merge branch 'tp32' into tp33

[sp...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

spmallette pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit dfaf9519a52e3de3f2dcd29856abaf5241ed07fd
Merge: 02e0b8b 50c1a96
Author: Stephen Mallette <sp...@genoprime.com>
AuthorDate: Mon Oct 8 08:38:38 2018 -0400

    Merge branch 'tp32' into tp33

 docs/src/dev/developer/release.asciidoc | 4 ++--
 pom.xml                                 | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --cc pom.xml
index 7585b9d,7899aad..aec3925
--- a/pom.xml
+++ b/pom.xml
@@@ -129,12 -131,11 +129,12 @@@ limitations under the License
          <module>gremlin-console</module>
          <module>gremlin-server</module>
          <module>gremlin-archetype</module>
 +        <module>gremlin-tools</module>
      </modules>
      <scm>
-         <connection>scm:git:git@git-wip-us.apache.org:repos/asf/tinkerpop.git</connection>
-         <developerConnection>scm:git:git@git-wip-us.apache.org:repos/asf/tinkerpop.git</developerConnection>
-         <url>https://git-wip-us.apache.org/repos/asf?p=tinkerpop.git</url>
+         <connection>scm:git:git@github.com:apache/tinkerpop.git</connection>
+         <developerConnection>scm:git:git@github.com:apache/tinkerpop.git</developerConnection>
+         <url>https://github.com/apache/tinkerpop</url>
      </scm>
      <properties>
          <commons.configuration.version>1.10</commons.configuration.version>