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

2016-04-15 Thread 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

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

2016-04-07 Thread elserj 
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/eb6a0381
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/eb6a0381
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/eb6a0381

Branch: refs/heads/master
Commit: eb6a0381054becda3ade7e634b92e76546614ca0
Parents: f7a24d7 b8084af
Author: Josh Elser 
Authored: Thu Apr 7 12:12:48 2016 -0400
Committer: Josh Elser 
Committed: Thu Apr 7 12:12:48 2016 -0400

--
 .../java/org/apache/accumulo/tserver/InMemoryMap.java |  2 +-
 .../test/java/org/apache/accumulo/test/InMemoryMapIT.java | 10 --
 2 files changed, 9 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/eb6a0381/server/tserver/src/main/java/org/apache/accumulo/tserver/InMemoryMap.java
--