You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ct...@apache.org on 2015/04/09 21:42:53 UTC
[2/2] accumulo git commit: Merge remote-tracking branch
'github/ACCUMULO-3714'
Merge remote-tracking branch 'github/ACCUMULO-3714'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8fbf2dce
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8fbf2dce
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/8fbf2dce
Branch: refs/heads/master
Commit: 8fbf2dce0d8c1d96158f39ae5090e2b962c80fdc
Parents: 8fae3f8 2e9643d
Author: Christopher Tubbs <ct...@apache.org>
Authored: Thu Apr 9 14:13:03 2015 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Thu Apr 9 14:13:03 2015 -0400
----------------------------------------------------------------------
.../apache/accumulo/core/cli/ClientOpts.java | 7 +++--
.../core/client/impl/ClientContext.java | 10 +++---
.../core/client/mock/MockConfiguration.java | 23 ++++++++++++--
.../core/conf/AccumuloConfiguration.java | 32 +++++++++-----------
.../accumulo/core/conf/ConfigurationCopy.java | 6 ++--
.../core/conf/DefaultConfiguration.java | 6 ++--
.../accumulo/core/conf/SiteConfiguration.java | 7 +++--
.../core/client/impl/ClientContextTest.java | 7 +++--
.../core/conf/DefaultConfigurationTest.java | 7 +++--
.../core/conf/ObservableConfigurationTest.java | 4 ++-
.../core/conf/SiteConfigurationTest.java | 7 +++--
.../server/conf/NamespaceConfiguration.java | 16 +++++-----
.../server/conf/TableConfiguration.java | 4 ++-
.../server/conf/ZooCachePropertyAccessor.java | 7 +++--
.../accumulo/server/conf/ZooConfiguration.java | 6 ++--
.../server/fs/PreferredVolumeChooser.java | 7 +++--
.../server/conf/NamespaceConfigurationTest.java | 11 ++++---
.../server/conf/TableConfigurationTest.java | 11 ++++---
.../conf/ZooCachePropertyAccessorTest.java | 24 +++++++++------
.../accumulo/server/util/FileUtilTest.java | 4 ++-
.../apache/accumulo/test/util/CertUtils.java | 5 +--
21 files changed, 132 insertions(+), 79 deletions(-)
----------------------------------------------------------------------