[accumulo] 01/01: Merge branch '1.7' into 1.8

[ct...@apache.org]

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

ctubbsii pushed a commit to branch 1.8
in repository https://gitbox.apache.org/repos/asf/accumulo.git

commit 1a2479acc40aa9a2b55867101211f9fdf614b5a7
Merge: 5848671 83d29cb
Author: Christopher Tubbs <ct...@apache.org>
AuthorDate: Tue Aug 29 17:24:12 2017 -0400

    Merge branch '1.7' into 1.8

 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --cc pom.xml
index 7e4e591,216cdf5..f2fbb35
--- a/pom.xml
+++ b/pom.xml
@@@ -96,16 -99,12 +96,16 @@@
      <module>server/native</module>
      <module>server/tracer</module>
      <module>server/tserver</module>
 +    <module>shell</module>
 +    <module>start</module>
 +    <module>test</module>
 +    <module>trace</module>
    </modules>
    <scm>
-     <connection>scm:git:git://git.apache.org/accumulo.git</connection>
-     <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/accumulo.git</developerConnection>
+     <connection>scm:git:https://gitbox.apache.org/repos/asf/accumulo.git</connection>
+     <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/accumulo.git</developerConnection>
      <tag>HEAD</tag>
-     <url>https://git-wip-us.apache.org/repos/asf?p=accumulo.git</url>
+     <url>https://gitbox.apache.org/repos/asf?p=accumulo.git</url>
    </scm>
    <issueManagement>
      <system>JIRA</system>

-- 
To stop receiving notification emails like this one, please contact
"commits@accumulo.apache.org" <co...@accumulo.apache.org>.