You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ec...@apache.org on 2014/03/26 17:51:25 UTC
[1/3] git commit: ACCUMULO-2555 Force use of known jline terminal
Repository: accumulo
Updated Branches:
refs/heads/master 36745b5a4 -> 624c1f93e
ACCUMULO-2555 Force use of known jline terminal
Some Jenkins builds appear to be having trouble with auto-detecting a
JLine terminal, so we force it to unsupported (for minimal feature set).
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/9550296c
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9550296c
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/9550296c
Branch: refs/heads/master
Commit: 9550296c82d338c3def77515dc665a18e3e90af9
Parents: f3f5480
Author: Mike Drob <md...@cloudera.com>
Authored: Wed Mar 26 11:36:43 2014 -0400
Committer: Mike Drob <md...@cloudera.com>
Committed: Wed Mar 26 11:36:43 2014 -0400
----------------------------------------------------------------------
.../accumulo/core/util/format/DeleterFormatterTest.java | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9550296c/core/src/test/java/org/apache/accumulo/core/util/format/DeleterFormatterTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/util/format/DeleterFormatterTest.java b/core/src/test/java/org/apache/accumulo/core/util/format/DeleterFormatterTest.java
index 4daf676..36def05 100644
--- a/core/src/test/java/org/apache/accumulo/core/util/format/DeleterFormatterTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/util/format/DeleterFormatterTest.java
@@ -35,6 +35,7 @@ import java.util.Collections;
import java.util.Map;
import java.util.TreeMap;
+import jline.UnsupportedTerminal;
import jline.console.ConsoleReader;
import org.apache.accumulo.core.client.BatchWriter;
@@ -69,10 +70,6 @@ public class DeleterFormatterTest {
public void set(String in) {
bais = new ByteArrayInputStream(in.getBytes(UTF8));
}
-
- public void set(byte... in) {
- bais = new ByteArrayInputStream(in);
- }
};
@Before
@@ -91,7 +88,7 @@ public class DeleterFormatterTest {
shellState = createNiceMock(Shell.class);
- reader = new ConsoleReader(input, baos);
+ reader = new ConsoleReader(input, baos, new UnsupportedTerminal());
expect(shellState.getReader()).andReturn(reader).anyTimes();
replay(writer, exceptionWriter, shellState);
@@ -132,7 +129,7 @@ public class DeleterFormatterTest {
@Test
public void testNoConfirmation() throws IOException {
- input.set((byte) -1);
+ input.set("");
data.put(new Key("z"), new Value("v2".getBytes(UTF8)));
formatter = new DeleterFormatter(writer, data.entrySet(), true, shellState, false);
[3/3] git commit: Merge branch '1.6.0-SNAPSHOT'
Posted by ec...@apache.org.
Merge branch '1.6.0-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/624c1f93
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/624c1f93
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/624c1f93
Branch: refs/heads/master
Commit: 624c1f93eec69e87acd13d76bff5012ff6fac626
Parents: 36745b5 67a11a8
Author: Eric C. Newton <er...@gmail.com>
Authored: Wed Mar 26 12:50:04 2014 -0400
Committer: Eric C. Newton <er...@gmail.com>
Committed: Wed Mar 26 12:50:04 2014 -0400
----------------------------------------------------------------------
.../accumulo/core/util/format/DeleterFormatterTest.java | 9 +++------
.../java/org/apache/accumulo/server/util/ZooKeeperMain.java | 4 ++--
2 files changed, 5 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
[2/3] git commit: ACCUMULO-2552 use volume manager to find the
instance id
Posted by ec...@apache.org.
ACCUMULO-2552 use volume manager to find the instance id
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/67a11a8d
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/67a11a8d
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/67a11a8d
Branch: refs/heads/master
Commit: 67a11a8d90086ac39e484edf2401d1ecbafe52d6
Parents: 9550296
Author: Eric C. Newton <er...@gmail.com>
Authored: Wed Mar 26 12:48:48 2014 -0400
Committer: Eric C. Newton <er...@gmail.com>
Committed: Wed Mar 26 12:49:02 2014 -0400
----------------------------------------------------------------------
.../main/java/org/apache/accumulo/server/util/ZooKeeperMain.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/67a11a8d/server/base/src/main/java/org/apache/accumulo/server/util/ZooKeeperMain.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/ZooKeeperMain.java b/server/base/src/main/java/org/apache/accumulo/server/util/ZooKeeperMain.java
index 7cac046..efcefde 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/ZooKeeperMain.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/ZooKeeperMain.java
@@ -18,9 +18,9 @@ package org.apache.accumulo.server.util;
import org.apache.accumulo.core.cli.Help;
import org.apache.accumulo.core.client.Instance;
-import org.apache.accumulo.core.util.CachedConfiguration;
import org.apache.accumulo.server.ServerConstants;
import org.apache.accumulo.server.client.HdfsZooInstance;
+import org.apache.accumulo.server.fs.VolumeManagerImpl;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
@@ -40,7 +40,7 @@ public class ZooKeeperMain {
public static void main(String[] args) throws Exception {
Opts opts = new Opts();
opts.parseArgs(ZooKeeperMain.class.getName(), args);
- FileSystem fs = FileSystem.get(CachedConfiguration.getInstance());
+ FileSystem fs = VolumeManagerImpl.get().getDefaultVolume().getFileSystem();
String baseDir = ServerConstants.getBaseUris()[0];
System.out.println("Using " + fs.makeQualified(new Path(baseDir + "/instance_id")) + " to lookup accumulo instance");
Instance instance = HdfsZooInstance.getInstance();