[accumulo] branch master updated (82a1568 -> 5f61709)

[ct...@apache.org]

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

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


    from 82a1568  ACCUMULO-4696 Cleaned up Main
     new 83d29cb  Update git URL to gitbox.apache.org
     new 1a2479a  Merge branch '1.7' into 1.8
     new 5f61709  Merge branch '1.8'

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


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

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

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

[ct...@apache.org]

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

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

commit 5f61709c804b7d6a2abc70088ffafdd5ff83bb0a
Merge: 82a1568 1a2479a
Author: Christopher Tubbs <ct...@apache.org>
AuthorDate: Tue Aug 29 17:24:44 2017 -0400

    Merge branch '1.8'

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

diff --cc pom.xml
index 5f5c2c9,f2fbb35..2b36346
--- a/pom.xml
+++ b/pom.xml
@@@ -97,12 -99,13 +97,12 @@@
      <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>.