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 2016/01/28 00:02:16 UTC

[1/6] accumulo git commit: ACCUMULO-3509 Fix UTF_8 import for 1.6

Repository: accumulo
Updated Branches:
  refs/heads/1.6 d3316b3cf -> ff1e003ae
  refs/heads/1.7 bd9969f1d -> 0faf8b9c0
  refs/heads/master 664012d16 -> 97ce2a758


ACCUMULO-3509 Fix UTF_8 import for 1.6


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

Branch: refs/heads/1.6
Commit: ff1e003ae98d11f5164fdce3f92564368ae5dd58
Parents: d3316b3
Author: Christopher Tubbs <ct...@apache.org>
Authored: Wed Jan 27 17:59:32 2016 -0500
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Wed Jan 27 17:59:32 2016 -0500

----------------------------------------------------------------------
 .../org/apache/accumulo/test/functional/SessionBlockVerifyIT.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/ff1e003a/test/src/test/java/org/apache/accumulo/test/functional/SessionBlockVerifyIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/SessionBlockVerifyIT.java b/test/src/test/java/org/apache/accumulo/test/functional/SessionBlockVerifyIT.java
index 05f304b..e641c13 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/SessionBlockVerifyIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/SessionBlockVerifyIT.java
@@ -16,7 +16,7 @@
  */
 package org.apache.accumulo.test.functional;
 
-import static java.nio.charset.StandardCharsets.UTF_8;
+import static com.google.common.base.Charsets.UTF_8;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 


[5/6] accumulo git commit: Merge branch '1.6' into 1.7

Posted by ct...@apache.org.
Merge branch '1.6' into 1.7


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

Branch: refs/heads/1.7
Commit: 0faf8b9c0619bdb203be704c7a09547a884fd58b
Parents: bd9969f ff1e003
Author: Christopher Tubbs <ct...@apache.org>
Authored: Wed Jan 27 18:01:32 2016 -0500
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Wed Jan 27 18:01:32 2016 -0500

----------------------------------------------------------------------

----------------------------------------------------------------------



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

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

Branch: refs/heads/master
Commit: 97ce2a7584876d617ecb2171c162b1482336bf62
Parents: 664012d 0faf8b9
Author: Christopher Tubbs <ct...@apache.org>
Authored: Wed Jan 27 18:01:49 2016 -0500
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Wed Jan 27 18:01:49 2016 -0500

----------------------------------------------------------------------

----------------------------------------------------------------------



[3/6] accumulo git commit: ACCUMULO-3509 Fix UTF_8 import for 1.6

Posted by ct...@apache.org.
ACCUMULO-3509 Fix UTF_8 import for 1.6


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

Branch: refs/heads/master
Commit: ff1e003ae98d11f5164fdce3f92564368ae5dd58
Parents: d3316b3
Author: Christopher Tubbs <ct...@apache.org>
Authored: Wed Jan 27 17:59:32 2016 -0500
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Wed Jan 27 17:59:32 2016 -0500

----------------------------------------------------------------------
 .../org/apache/accumulo/test/functional/SessionBlockVerifyIT.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/ff1e003a/test/src/test/java/org/apache/accumulo/test/functional/SessionBlockVerifyIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/SessionBlockVerifyIT.java b/test/src/test/java/org/apache/accumulo/test/functional/SessionBlockVerifyIT.java
index 05f304b..e641c13 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/SessionBlockVerifyIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/SessionBlockVerifyIT.java
@@ -16,7 +16,7 @@
  */
 package org.apache.accumulo.test.functional;
 
-import static java.nio.charset.StandardCharsets.UTF_8;
+import static com.google.common.base.Charsets.UTF_8;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 


[4/6] accumulo git commit: Merge branch '1.6' into 1.7

Posted by ct...@apache.org.
Merge branch '1.6' into 1.7


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

Branch: refs/heads/master
Commit: 0faf8b9c0619bdb203be704c7a09547a884fd58b
Parents: bd9969f ff1e003
Author: Christopher Tubbs <ct...@apache.org>
Authored: Wed Jan 27 18:01:32 2016 -0500
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Wed Jan 27 18:01:32 2016 -0500

----------------------------------------------------------------------

----------------------------------------------------------------------



[2/6] accumulo git commit: ACCUMULO-3509 Fix UTF_8 import for 1.6

Posted by ct...@apache.org.
ACCUMULO-3509 Fix UTF_8 import for 1.6


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

Branch: refs/heads/1.7
Commit: ff1e003ae98d11f5164fdce3f92564368ae5dd58
Parents: d3316b3
Author: Christopher Tubbs <ct...@apache.org>
Authored: Wed Jan 27 17:59:32 2016 -0500
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Wed Jan 27 17:59:32 2016 -0500

----------------------------------------------------------------------
 .../org/apache/accumulo/test/functional/SessionBlockVerifyIT.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/ff1e003a/test/src/test/java/org/apache/accumulo/test/functional/SessionBlockVerifyIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/SessionBlockVerifyIT.java b/test/src/test/java/org/apache/accumulo/test/functional/SessionBlockVerifyIT.java
index 05f304b..e641c13 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/SessionBlockVerifyIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/SessionBlockVerifyIT.java
@@ -16,7 +16,7 @@
  */
 package org.apache.accumulo.test.functional;
 
-import static java.nio.charset.StandardCharsets.UTF_8;
+import static com.google.common.base.Charsets.UTF_8;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;