You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@accumulo.apache.org by vi...@apache.org on 2014/03/05 19:34:53 UTC

[2/2] git commit: Merge branch '1.6.0-SNAPSHOT'

Merge branch '1.6.0-SNAPSHOT'


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

Branch: refs/heads/master
Commit: ca37b87752c1b97d47a4d7d7c33174bca1cfa8b5
Parents: ecc4315 b75dcc5
Author: John Vines <vi...@apache.org>
Authored: Wed Mar 5 13:34:49 2014 -0500
Committer: John Vines <vi...@apache.org>
Committed: Wed Mar 5 13:34:49 2014 -0500

----------------------------------------------------------------------
 .../accumulo/minicluster/impl/MiniAccumuloConfigImpl.java    | 8 +++-----
 .../org/apache/accumulo/test/functional/AbstractMacIT.java   | 8 ++++----
 .../java/org/apache/accumulo/test/functional/BulkIT.java     | 7 +++----
 .../apache/accumulo/test/functional/ConfigurableMacIT.java   | 2 +-
 .../java/org/apache/accumulo/test/functional/ExamplesIT.java | 8 ++++----
 .../org/apache/accumulo/test/functional/SimpleMacIT.java     | 2 +-
 .../test/java/org/apache/accumulo/test/functional/SslIT.java | 4 ++--
 7 files changed, 18 insertions(+), 21 deletions(-)
----------------------------------------------------------------------