subject:"\[21\/21\] accumulo git commit\: Merge branch '1.7'"

[21/21] accumulo git commit: Merge branch '1.7'

2016-02-02 Thread ctubbsii

Merge branch '1.7'

Conflicts:
core/src/test/java/org/apache/accumulo/core/util/ByteBufferUtilTest.java
test/src/main/java/org/apache/accumulo/test/ConditionalWriterIT.java
test/src/main/java/org/apache/accumulo/test/functional/DeleteIT.java
test/src/main/java/org/apache/accumulo/test/functional/ExamplesIT.java
test/src/main/java/org/apache/accumulo/test/functional/RestartIT.java

test/src/main/java/org/apache/accumulo/test/functional/RestartStressIT.java
test/src/main/java/org/apache/accumulo/test/functional/SplitIT.java
test/src/test/java/org/apache/accumulo/test/AccumuloOutputFormatIT.java


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

Branch: refs/heads/master
Commit: 2c8088e99d6820449e2b364162fb9bd03d212f38
Parents: 1c696a9 a706b01
Author: Christopher Tubbs 
Authored: Tue Feb 2 22:08:12 2016 -0500
Committer: Christopher Tubbs 
Committed: Tue Feb 2 22:08:12 2016 -0500

--
 .../core/file/rfile/VisMetricsGatherer.java |  5 +++--
 .../accumulo/core/util/ByteBufferUtilTest.java  | 20 ++--
 .../core/util/UnsynchronizedBufferTest.java | 10 +-
 .../apache/accumulo/proxy/ProxyServerTest.java  |  5 ++---
 .../server/util/FileSystemMonitorTest.java  |  3 +--
 .../providers/HdfsFileContentInfoFactory.java   |  4 +++-
 .../vfs/providers/HdfsFileSystem.java   |  4 +++-
 .../vfs/providers/HdfsRandomAccessContent.java  |  5 +++--
 .../accumulo/harness/MiniClusterHarness.java|  4 ++--
 .../accumulo/test/ConditionalWriterIT.java  |  6 +++---
 .../accumulo/test/GenerateSequentialRFile.java  |  4 ++--
 .../org/apache/accumulo/test/ShellConfigIT.java |  4 ++--
 .../accumulo/test/TransportCachingIT.java   |  2 +-
 .../functional/BulkSplitOptimizationIT.java |  2 +-
 .../accumulo/test/functional/DeleteIT.java  |  5 ++---
 .../accumulo/test/functional/ExamplesIT.java|  2 +-
 .../accumulo/test/functional/ReadWriteIT.java   |  6 +++---
 .../accumulo/test/functional/RestartIT.java | 13 ++---
 .../test/functional/RestartStressIT.java|  9 -
 .../accumulo/test/functional/ScanIdIT.java  |  2 +-
 .../accumulo/test/functional/SplitIT.java   |  9 -
 .../replication/merkle/cli/GenerateHashes.java  |  5 +++--
 22 files changed, 65 insertions(+), 64 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/2c8088e9/core/src/test/java/org/apache/accumulo/core/util/ByteBufferUtilTest.java
--
diff --cc 
core/src/test/java/org/apache/accumulo/core/util/ByteBufferUtilTest.java
index d6e1b35,5a8c0dc..85a36fa
--- a/core/src/test/java/org/apache/accumulo/core/util/ByteBufferUtilTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/util/ByteBufferUtilTest.java
@@@ -17,7 -17,8 +17,9 @@@
  
  package org.apache.accumulo.core.util;
  
+ import static java.nio.charset.StandardCharsets.UTF_8;
+ 
 +import java.io.ByteArrayInputStream;
  import java.io.ByteArrayOutputStream;
  import java.io.DataOutputStream;
  import java.io.IOException;
@@@ -54,16 -53,7 +54,16 @@@ public class ByteBufferUtilTest 
throw new RuntimeException(e);
  }
  
- Assert.assertEquals(expected, new String(baos.toByteArray(), 
Charsets.UTF_8));
+ Assert.assertEquals(expected, new String(baos.toByteArray(), UTF_8));
 +
 +ByteArrayInputStream bais = ByteBufferUtil.toByteArrayInputStream(bb);
 +byte[] buffer = new byte[expected.length()];
 +try {
 +  bais.read(buffer);
-   Assert.assertEquals(expected, new String(buffer, Charsets.UTF_8));
++  Assert.assertEquals(expected, new String(buffer, UTF_8));
 +} catch (IOException e) {
 +  throw new RuntimeException(e);
 +}
}
  
@Test

http://git-wip-us.apache.org/repos/asf/accumulo/blob/2c8088e9/test/src/main/java/org/apache/accumulo/harness/MiniClusterHarness.java
--
diff --cc test/src/main/java/org/apache/accumulo/harness/MiniClusterHarness.java
index d923593,000..f021e32
mode 100644,00..100644
--- a/test/src/main/java/org/apache/accumulo/harness/MiniClusterHarness.java
+++ b/test/src/main/java/org/apache/accumulo/harness/MiniClusterHarness.java
@@@ -1,242 -1,0 +1,242 @@@
 +/*
 + * Licensed to the Apache Software Foundation (ASF) under one or more
 + * contributor license agreements.  See the NOTICE file distributed with
 + * this work for additional information regarding copyright ownership.
 + * The ASF licenses this file to You under the Apache

[21/21] accumulo git commit: Merge branch '1.7'

2015-09-12 Thread elserj

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/ca05baa7
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ca05baa7
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ca05baa7

Branch: refs/heads/master
Commit: ca05baa70befe6ebc9aaedaa93f1f83dafcb33d4
Parents: fb5fc55 6558b4a
Author: Josh Elser 
Authored: Sat Sep 12 18:33:17 2015 -0400
Committer: Josh Elser 
Committed: Sat Sep 12 18:33:17 2015 -0400

--
 LICENSE | 134 +---
 NOTICE  |  11 +-
 assemble/bin-LICENSE| 674 +++
 assemble/bin-NOTICE |  59 ++
 assemble/src/main/assemblies/component.xml  |  14 +-
 .../main/appended-resources/META-INF/LICENSE|  46 ++
 .../main/appended-resources/META-INF/LICENSE|  74 ++
 .../src/main/appended-resources/META-INF/NOTICE |   9 +
 8 files changed, 910 insertions(+), 111 deletions(-)
--

[21/21] accumulo git commit: Merge branch '1.7'

2015-05-20 Thread ctubbsii

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/a9d1ad4a
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a9d1ad4a
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a9d1ad4a

Branch: refs/heads/master
Commit: a9d1ad4a7d470071e59382dfad0e10d49c9ee464
Parents: e22103c 1faee53
Author: Christopher Tubbs ctubb...@apache.org
Authored: Wed May 20 12:09:26 2015 -0400
Committer: Christopher Tubbs ctubb...@apache.org
Committed: Wed May 20 12:09:26 2015 -0400

--
 CHANGES |  1 +
 assemble/bin/config.sh  |  6 +-
 assemble/bin/start-server.sh|  4 +-
 .../core/client/impl/ConditionalWriterImpl.java |  2 +-
 .../accumulo/core/file/rfile/bcfile/Utils.java  |  2 +-
 .../iterators/user/IntersectingIterator.java| 19 ++---
 .../mapred/AccumuloFileOutputFormatTest.java|  2 +
 .../mapreduce/AccumuloFileOutputFormatTest.java |  2 +
 .../accumulo/examples/simple/shard/Index.java   |  7 +-
 .../impl/MiniAccumuloClusterImpl.java   | 17 ++--
 .../impl/MiniAccumuloConfigImpl.java|  8 +-
 pom.xml |  8 +-
 .../accumulo/server/util/SendLogToChainsaw.java |  2 +-
 .../org/apache/accumulo/monitor/util/Table.java |  2 +-
 .../monitor/util/celltypes/NumberType.java  |  2 +-
 .../accumulo/tserver/log/LocalWALRecovery.java  | 75 -
 .../accumulo/tserver/tablet/RootFilesTest.java  |  7 +-
 .../shell/commands/FormatterCommandTest.java|  2 +-
 .../start/classloader/AccumuloClassLoader.java  |  7 +-
 .../classloader/vfs/UniqueFileReplicator.java   |  3 +-
 .../accumulo/test/continuous/TimeBinner.java|  3 +
 .../test/continuous/UndefinedAnalyzer.java  | 84 ++--
 .../test/functional/CacheTestWriter.java|  3 +
 .../apache/accumulo/test/randomwalk/Node.java   | 16 ++--
 .../test/randomwalk/multitable/CopyTool.java|  6 +-
 .../apache/accumulo/test/AuditMessageIT.java|  5 +-
 26 files changed, 168 insertions(+), 127 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/a9d1ad4a/pom.xml
--

[21/21] accumulo git commit: Merge branch '1.7'

[21/21] accumulo git commit: Merge branch '1.7'

[21/21] accumulo git commit: Merge branch '1.7'

3 matches

Site Navigation

Mail list logo

Footer information