accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject [10/34] accumulo git commit: ACCUMULO-3423 merge master
Date Fri, 24 Apr 2015 23:20:56 GMT
ACCUMULO-3423 merge master


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

Branch: refs/heads/master
Commit: f4f28c7bad0df92fade2e88da217f60bfb826783
Parents: 31ee26b 01558a4
Author: Eric C. Newton <eric.newton@gmail.com>
Authored: Wed Mar 11 14:41:15 2015 -0400
Committer: Eric C. Newton <eric.newton@gmail.com>
Committed: Wed Mar 11 14:41:15 2015 -0400

----------------------------------------------------------------------
 assemble/bin/tool.sh                            |  7 +-
 .../client/security/tokens/KerberosToken.java   |  3 +-
 .../accumulo/core/file/rfile/PrintInfo.java     | 15 +++-
 .../simple/client/TraceDumpExample.java         | 28 ++++++-
 .../standalone/StandaloneAccumuloCluster.java   | 14 ++--
 .../standalone/StandaloneClusterControl.java    |  5 +-
 .../org/apache/accumulo/proxy/ProxyServer.java  | 18 ++++-
 .../accumulo/test/SizeCompactionStrategy.java   | 59 ++++++++++++++
 .../accumulo/test/TestCompactionStrategy.java   | 72 +++++++++++++++++
 .../accumulo/harness/AccumuloClusterIT.java     |  2 +-
 .../StandaloneAccumuloClusterConfiguration.java | 14 +++-
 .../accumulo/proxy/ProxyDurabilityIT.java       |  8 +-
 .../apache/accumulo/proxy/SimpleProxyBase.java  | 20 ++++-
 .../accumulo/test/BulkImportVolumeIT.java       |  1 +
 .../accumulo/test/ConditionalWriterIT.java      | 21 +++++
 .../org/apache/accumulo/test/MetaSplitIT.java   | 39 ++++++++-
 .../org/apache/accumulo/test/NamespacesIT.java  |  3 +
 .../org/apache/accumulo/test/ShellServerIT.java |  1 -
 .../accumulo/test/UserCompactionStrategyIT.java | 85 --------------------
 .../accumulo/test/functional/CleanUpIT.java     |  4 +-
 .../accumulo/test/functional/CloneTestIT.java   |  4 +-
 .../accumulo/test/functional/CredentialsIT.java | 15 ++--
 .../accumulo/test/functional/ExamplesIT.java    | 45 ++++++++---
 .../accumulo/test/functional/ReadWriteIT.java   | 16 +++-
 .../accumulo/test/functional/ScanIdIT.java      | 36 +++++----
 test/src/test/resources/log4j.properties        |  1 +
 26 files changed, 388 insertions(+), 148 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/f4f28c7b/test/src/test/java/org/apache/accumulo/proxy/ProxyDurabilityIT.java
----------------------------------------------------------------------
diff --cc test/src/test/java/org/apache/accumulo/proxy/ProxyDurabilityIT.java
index de8ebc8,404a8fd..654d27d
--- a/test/src/test/java/org/apache/accumulo/proxy/ProxyDurabilityIT.java
+++ b/test/src/test/java/org/apache/accumulo/proxy/ProxyDurabilityIT.java
@@@ -58,14 -60,9 +60,14 @@@ import com.google.common.net.HostAndPor
  public class ProxyDurabilityIT extends ConfigurableMacIT {
  
    @Override
 +  protected int defaultTimeoutSeconds() {
 +    return 60;
 +  }
 +
 +  @Override
    public void configure(MiniAccumuloConfigImpl cfg, Configuration hadoopCoreSite) {
      hadoopCoreSite.set("fs.file.impl", RawLocalFileSystem.class.getName());
-     cfg.setProperty(Property.INSTANCE_ZK_TIMEOUT, "5s");
+     cfg.setProperty(Property.INSTANCE_ZK_TIMEOUT, "10s");
      cfg.setNumTservers(1);
    }
  

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f4f28c7b/test/src/test/java/org/apache/accumulo/test/ConditionalWriterIT.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f4f28c7b/test/src/test/java/org/apache/accumulo/test/ShellServerIT.java
----------------------------------------------------------------------


Mime
View raw message