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 2014/06/19 04:02:15 UTC
[27/28] git commit: Merge branch '1.6.1-SNAPSHOT'
Merge branch '1.6.1-SNAPSHOT'
Conflicts:
core/src/main/java/org/apache/accumulo/core/conf/ObservableConfiguration.java
core/src/test/java/org/apache/accumulo/core/util/AsyncSocketAppenderTest.java
server/base/src/main/java/org/apache/accumulo/server/zookeeper/ZooReaderWriterFactory.java
server/tserver/src/main/java/org/apache/accumulo/tserver/log/LocalWALRecovery.java
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/77b39ae4
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/77b39ae4
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/77b39ae4
Branch: refs/heads/master
Commit: 77b39ae4d4cb8e4befb9ab2558e86e2e20ae0d40
Parents: fca82d8 9357417
Author: Christopher Tubbs <ct...@apache.org>
Authored: Wed Jun 18 21:56:00 2014 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Wed Jun 18 21:56:00 2014 -0400
----------------------------------------------------------------------
.../accumulo/core/conf/ObservableConfiguration.java | 3 ++-
.../core/iterators/conf/ColumnToClassMapping.java | 11 ++++++-----
.../core/iterators/user/RowEncodingIterator.java | 8 --------
.../accumulo/core/util/AsyncSocketAppenderTest.java | 10 +++++++---
.../server/zookeeper/ZooReaderWriterFactory.java | 8 ++++----
.../java/org/apache/accumulo/server/AccumuloTest.java | 13 +++++++------
.../org/apache/accumulo/test/stress/random/Stream.java | 1 -
7 files changed, 26 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/77b39ae4/server/base/src/main/java/org/apache/accumulo/server/zookeeper/ZooReaderWriterFactory.java
----------------------------------------------------------------------
diff --cc server/base/src/main/java/org/apache/accumulo/server/zookeeper/ZooReaderWriterFactory.java
index 0f22f07,0a9508c..40a9d76
--- a/server/base/src/main/java/org/apache/accumulo/server/zookeeper/ZooReaderWriterFactory.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/zookeeper/ZooReaderWriterFactory.java
@@@ -18,7 -18,8 +18,8 @@@ package org.apache.accumulo.server.zook
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Proxy;
- import java.nio.charset.Charset;
++import java.nio.charset.StandardCharsets;
+
-import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.conf.AccumuloConfiguration;
import org.apache.accumulo.core.conf.Property;
import org.apache.accumulo.fate.zookeeper.IZooReaderWriter;
@@@ -48,7 -48,7 +48,7 @@@ public class ZooReaderWriterFactory
* @return reader/writer
*/
public IZooReaderWriter getZooReaderWriter(String string, int timeInMillis, String secret) {
- return new ZooReaderWriter(string, timeInMillis, SCHEME, (USER + ":" + secret).getBytes(UTF8));
- return new ZooReaderWriter(string, timeInMillis, SCHEME, (USER + ":" + secret).getBytes(Constants.UTF8));
++ return new ZooReaderWriter(string, timeInMillis, SCHEME, (USER + ":" + secret).getBytes(StandardCharsets.UTF_8));
}
/**