[5/5] accumulo git commit: Merge branch '1.7'

[ctubbsii]

Merge branch '1.7'


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6fbf2d2b
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6fbf2d2b
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6fbf2d2b

Branch: refs/heads/master
Commit: 6fbf2d2b6c843dcaedd5740e80f8ce7c408c734b
Parents: 8ac30b8 d42b770
Author: Christopher Tubbs 
Authored: Fri Apr 15 19:23:39 2016 -0400
Committer: Christopher Tubbs 
Committed: Fri Apr 15 19:23:39 2016 -0400

--
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)
--

[1/5] accumulo git commit: ACCUMULO-4182 Override hostname for travis-ci

[ctubbsii]

Repository: accumulo
Updated Branches:
  refs/heads/1.7 2d3330e7e -> d42b77009
  refs/heads/master 8ac30b8d1 -> 6fbf2d2b6


ACCUMULO-4182 Override hostname for travis-ci

Attempt to work around a buffer overflow issue on travis-ci using
openjdk with long hostnames (https://docs.travis-ci.com/user/hostname)


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ce6598f0
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ce6598f0
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ce6598f0

Branch: refs/heads/1.7
Commit: ce6598f0e34bc1b6481a216c089588e3e23dd22a
Parents: 99e3023
Author: Christopher Tubbs 
Authored: Fri Apr 15 19:03:18 2016 -0400
Committer: Christopher Tubbs 
Committed: Fri Apr 15 19:03:18 2016 -0400

--
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/ce6598f0/.travis.yml
--
diff --git a/.travis.yml b/.travis.yml
index 64e44a2..765644d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,6 +13,8 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 language: java
+addons:
+  hostname: travis-accumulo-host
 notifications:
   irc:
 channels:

[4/5] accumulo git commit: Merge branch '1.6' into 1.7

[ctubbsii]

Merge branch '1.6' into 1.7


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d42b7700
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d42b7700
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d42b7700

Branch: refs/heads/1.7
Commit: d42b770098e83c10b04ef9cbeae7364ddda3cfa7
Parents: 2d3330e ce6598f
Author: Christopher Tubbs 
Authored: Fri Apr 15 19:23:11 2016 -0400
Committer: Christopher Tubbs 
Committed: Fri Apr 15 19:23:11 2016 -0400

--
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/d42b7700/.travis.yml
--

accumulo git commit: ACCUMULO-4182 Override hostname for travis-ci

[ctubbsii]

Repository: accumulo
Updated Branches:
  refs/heads/1.6 99e3023c7 -> ce6598f0e


ACCUMULO-4182 Override hostname for travis-ci

Attempt to work around a buffer overflow issue on travis-ci using
openjdk with long hostnames (https://docs.travis-ci.com/user/hostname)


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ce6598f0
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ce6598f0
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ce6598f0

Branch: refs/heads/1.6
Commit: ce6598f0e34bc1b6481a216c089588e3e23dd22a
Parents: 99e3023
Author: Christopher Tubbs 
Authored: Fri Apr 15 19:03:18 2016 -0400
Committer: Christopher Tubbs 
Committed: Fri Apr 15 19:03:18 2016 -0400

--
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/ce6598f0/.travis.yml
--
diff --git a/.travis.yml b/.travis.yml
index 64e44a2..765644d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,6 +13,8 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 language: java
+addons:
+  hostname: travis-accumulo-host
 notifications:
   irc:
 channels:

[2/7] accumulo git commit: ACCUMULO-4182 Improve travis-ci builds

[ctubbsii]

ACCUMULO-4182 Improve travis-ci builds

* Set up caching of maven dependencies
* Add IRC notifications
* Clear any cached accumulo artifacts
* Use https for maven central
* Skip pre-fetching of maven dependencies with separate mvn execution


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/99e3023c
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/99e3023c
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/99e3023c

Branch: refs/heads/1.7
Commit: 99e3023c7f96a2553282dc73cffdf82659285d2d
Parents: 6665905
Author: Christopher Tubbs 
Authored: Fri Apr 15 18:26:28 2016 -0400
Committer: Christopher Tubbs 
Committed: Fri Apr 15 18:26:28 2016 -0400

--
 .travis.yml | 24 
 1 file changed, 20 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/99e3023c/.travis.yml
--
diff --git a/.travis.yml b/.travis.yml
index e4626ce..64e44a2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,9 +13,25 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 language: java
+notifications:
+  irc:
+channels:
+  - "chat.freenode.net#accumulo"
+use_notice: true
+skip_join: true
+# speed up builds; don't use with install
+cache:
+  directories:
+- $HOME/.m2
+# skip pre-fetch of maven dependencies
+install: true
 jdk:
-  - openjdk6
-  - openjdk7
-  - oraclejdk7
   - oraclejdk8
-script: mvn clean verify -DskipITs
+  - oraclejdk7
+  - openjdk7
+  - openjdk6
+# clear any cache of accumulo artifacts, just in case; use https for central
+before_script:
+  - rm -rf $HOME/.m2/repository/org/apache/accumulo
+  - echo "secure-centralhttps://repo.maven.apache.org/maven2central"
 > $HOME/settings-custom.xml
+script: mvn --settings $HOME/settings-custom.xml clean verify -DskipITs

[4/7] accumulo git commit: Merge branch '1.6' into 1.7

[ctubbsii]

Merge branch '1.6' into 1.7

Conflicts:
.travis.yml


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/2d3330e7
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/2d3330e7
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/2d3330e7

Branch: refs/heads/master
Commit: 2d3330e7ea07328c79ffa601afed4ad559591eac
Parents: c37ba87 99e3023
Author: Christopher Tubbs 
Authored: Fri Apr 15 18:31:28 2016 -0400
Committer: Christopher Tubbs 
Committed: Fri Apr 15 18:31:28 2016 -0400

--
 .travis.yml | 22 +++---
 1 file changed, 19 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/2d3330e7/.travis.yml
--
diff --cc .travis.yml
index b249511,64e44a2..5617017
--- a/.travis.yml
+++ b/.travis.yml
@@@ -13,8 -13,25 +13,24 @@@
  #  See the License for the specific language governing permissions and
  #  limitations under the License.
  language: java
+ notifications:
+   irc:
+ channels:
+   - "chat.freenode.net#accumulo"
+ use_notice: true
+ skip_join: true
+ # speed up builds; don't use with install
+ cache:
+   directories:
+ - $HOME/.m2
+ # skip pre-fetch of maven dependencies
+ install: true
  jdk:
-   - openjdk7
-   - oraclejdk7
- oraclejdk8
- script: mvn clean verify -DskipITs
+   - oraclejdk7
+   - openjdk7
 -  - openjdk6
+ # clear any cache of accumulo artifacts, just in case; use https for central
+ before_script:
+   - rm -rf $HOME/.m2/repository/org/apache/accumulo
+   - echo "secure-centralhttps://repo.maven.apache.org/maven2central"
 > $HOME/settings-custom.xml
+ script: mvn --settings $HOME/settings-custom.xml clean verify -DskipITs

[6/7] accumulo git commit: Revert "ACCUMULO-4182 Attempt to add cache to travis"

[ctubbsii]

Revert "ACCUMULO-4182 Attempt to add cache to travis"

This reverts commit a5c8adfee952f5c27d3d997131b155047a5e7eff.


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/442ffda1
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/442ffda1
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/442ffda1

Branch: refs/heads/master
Commit: 442ffda1e34d4e8411ab33beed27c4b12de10535
Parents: a5c8adf
Author: Christopher Tubbs 
Authored: Fri Apr 15 18:33:40 2016 -0400
Committer: Christopher Tubbs 
Committed: Fri Apr 15 18:33:40 2016 -0400

--
 .travis.yml | 7 ---
 1 file changed, 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/442ffda1/.travis.yml
--
diff --git a/.travis.yml b/.travis.yml
index 5f9554e..b249511 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,13 +13,6 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 language: java
-branches:
-  only:
-- master
-- gh-pages
-- /^[0-9]*[.][0-9]*$/
-cache:
-  - $HOME/.m2
 jdk:
   - openjdk7
   - oraclejdk7

[3/7] accumulo git commit: ACCUMULO-4182 Improve travis-ci builds

[ctubbsii]

ACCUMULO-4182 Improve travis-ci builds

* Set up caching of maven dependencies
* Add IRC notifications
* Clear any cached accumulo artifacts
* Use https for maven central
* Skip pre-fetching of maven dependencies with separate mvn execution


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/99e3023c
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/99e3023c
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/99e3023c

Branch: refs/heads/master
Commit: 99e3023c7f96a2553282dc73cffdf82659285d2d
Parents: 6665905
Author: Christopher Tubbs 
Authored: Fri Apr 15 18:26:28 2016 -0400
Committer: Christopher Tubbs 
Committed: Fri Apr 15 18:26:28 2016 -0400

--
 .travis.yml | 24 
 1 file changed, 20 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/99e3023c/.travis.yml
--
diff --git a/.travis.yml b/.travis.yml
index e4626ce..64e44a2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,9 +13,25 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 language: java
+notifications:
+  irc:
+channels:
+  - "chat.freenode.net#accumulo"
+use_notice: true
+skip_join: true
+# speed up builds; don't use with install
+cache:
+  directories:
+- $HOME/.m2
+# skip pre-fetch of maven dependencies
+install: true
 jdk:
-  - openjdk6
-  - openjdk7
-  - oraclejdk7
   - oraclejdk8
-script: mvn clean verify -DskipITs
+  - oraclejdk7
+  - openjdk7
+  - openjdk6
+# clear any cache of accumulo artifacts, just in case; use https for central
+before_script:
+  - rm -rf $HOME/.m2/repository/org/apache/accumulo
+  - echo "secure-centralhttps://repo.maven.apache.org/maven2central"
 > $HOME/settings-custom.xml
+script: mvn --settings $HOME/settings-custom.xml clean verify -DskipITs

[7/7] accumulo git commit: Merge branch '1.7'

[ctubbsii]

Merge branch '1.7'


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8ac30b8d
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8ac30b8d
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/8ac30b8d

Branch: refs/heads/master
Commit: 8ac30b8d16316e3e03054cfb3786e6b857b528c0
Parents: 442ffda 2d3330e
Author: Christopher Tubbs 
Authored: Fri Apr 15 18:33:54 2016 -0400
Committer: Christopher Tubbs 
Committed: Fri Apr 15 18:33:54 2016 -0400

--
 .travis.yml | 22 +++---
 1 file changed, 19 insertions(+), 3 deletions(-)
--