accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [11/11] accumulo git commit: Merge branch '1.7'
Date Fri, 29 May 2015 01:28:59 GMT
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/63313820
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/63313820
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/63313820

Branch: refs/heads/master
Commit: 633138205820f0b785e32307b6d538a8690aca5a
Parents: 32b3730 44cd470
Author: Josh Elser <elserj@apache.org>
Authored: Thu May 28 21:14:28 2015 -0400
Committer: Josh Elser <elserj@apache.org>
Committed: Thu May 28 21:14:28 2015 -0400

----------------------------------------------------------------------
 .../org/apache/accumulo/core/trace/Trace.java   |  3 +-
 .../server/conf/ServerConfigurationFactory.java | 31 +++++++++++++-------
 .../master/tableOps/CreateImportDir.java        |  4 +++
 .../org/apache/accumulo/monitor/Monitor.java    |  7 +++--
 .../apache/accumulo/test/scalability/Run.java   |  6 +++-
 .../apache/accumulo/trace/instrument/Trace.java |  3 +-
 6 files changed, 37 insertions(+), 17 deletions(-)
----------------------------------------------------------------------



Mime
View raw message