You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by el...@apache.org on 2014/03/26 00:08:08 UTC

[1/3] git commit: ACCUMULO-2503 Fix timezone-related failures in ShellTest

Repository: accumulo
Updated Branches:
  refs/heads/1.6.0-SNAPSHOT fa49e8041 -> ce38eeadc
  refs/heads/master 111b56dee -> eb72c5ba0


ACCUMULO-2503 Fix timezone-related failures in ShellTest


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

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: ce38eeadc41782fd62a0d46e63cbad93f7c997f6
Parents: fa49e80
Author: Josh Elser <el...@apache.org>
Authored: Tue Mar 25 16:07:22 2014 -0700
Committer: Josh Elser <el...@apache.org>
Committed: Tue Mar 25 16:07:22 2014 -0700

----------------------------------------------------------------------
 .../test/java/org/apache/accumulo/core/util/shell/ShellTest.java   | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/ce38eead/core/src/test/java/org/apache/accumulo/core/util/shell/ShellTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/util/shell/ShellTest.java b/core/src/test/java/org/apache/accumulo/core/util/shell/ShellTest.java
index 82d1f34..3d9b89e 100644
--- a/core/src/test/java/org/apache/accumulo/core/util/shell/ShellTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/util/shell/ShellTest.java
@@ -27,6 +27,7 @@ import java.io.PrintWriter;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.TimeZone;
 
 import jline.console.ConsoleReader;
 
@@ -103,6 +104,7 @@ public class ShellTest {
 
   @Before
   public void setup() throws IOException {
+    TimeZone.setDefault(TimeZone.getTimeZone("UTC"));
     Shell.log.setLevel(Level.OFF);
     output = new TestOutputStream();
     input = new StringInputStream();


[2/3] git commit: ACCUMULO-2503 Fix timezone-related failures in ShellTest

Posted by el...@apache.org.
ACCUMULO-2503 Fix timezone-related failures in ShellTest


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

Branch: refs/heads/master
Commit: ce38eeadc41782fd62a0d46e63cbad93f7c997f6
Parents: fa49e80
Author: Josh Elser <el...@apache.org>
Authored: Tue Mar 25 16:07:22 2014 -0700
Committer: Josh Elser <el...@apache.org>
Committed: Tue Mar 25 16:07:22 2014 -0700

----------------------------------------------------------------------
 .../test/java/org/apache/accumulo/core/util/shell/ShellTest.java   | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/ce38eead/core/src/test/java/org/apache/accumulo/core/util/shell/ShellTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/util/shell/ShellTest.java b/core/src/test/java/org/apache/accumulo/core/util/shell/ShellTest.java
index 82d1f34..3d9b89e 100644
--- a/core/src/test/java/org/apache/accumulo/core/util/shell/ShellTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/util/shell/ShellTest.java
@@ -27,6 +27,7 @@ import java.io.PrintWriter;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.TimeZone;
 
 import jline.console.ConsoleReader;
 
@@ -103,6 +104,7 @@ public class ShellTest {
 
   @Before
   public void setup() throws IOException {
+    TimeZone.setDefault(TimeZone.getTimeZone("UTC"));
     Shell.log.setLevel(Level.OFF);
     output = new TestOutputStream();
     input = new StringInputStream();


[3/3] git commit: Merge branch '1.6.0-SNAPSHOT'

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

Branch: refs/heads/master
Commit: eb72c5ba0831c5fafe01ac30a7e53f48eefcdba5
Parents: 111b56d ce38eea
Author: Josh Elser <el...@apache.org>
Authored: Tue Mar 25 16:07:56 2014 -0700
Committer: Josh Elser <el...@apache.org>
Committed: Tue Mar 25 16:07:56 2014 -0700

----------------------------------------------------------------------
 .../test/java/org/apache/accumulo/core/util/shell/ShellTest.java   | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------