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 2015/05/28 20:10:03 UTC
[01/10] accumulo git commit: ACCUMULO-3856 Remove some trailing
whitespace (checkstyle failure)
Repository: accumulo
Updated Branches:
refs/heads/1.5 11f108e25 -> 362b8ac33
refs/heads/1.6 0cf5b9ca0 -> 244eeb671
refs/heads/1.7 f9a29c77d -> 9e08255f6
refs/heads/master 8c1d2d0c1 -> 0c7ddfe94
ACCUMULO-3856 Remove some trailing whitespace (checkstyle failure)
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/362b8ac3
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/362b8ac3
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/362b8ac3
Branch: refs/heads/1.5
Commit: 362b8ac334dec7d4be3d09d949972957ebb6c37a
Parents: 11f108e
Author: Josh Elser <el...@apache.org>
Authored: Thu May 28 14:09:20 2015 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Thu May 28 14:09:20 2015 -0400
----------------------------------------------------------------------
.../test/java/org/apache/accumulo/proxy/ProxyServerTest.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/362b8ac3/proxy/src/test/java/org/apache/accumulo/proxy/ProxyServerTest.java
----------------------------------------------------------------------
diff --git a/proxy/src/test/java/org/apache/accumulo/proxy/ProxyServerTest.java b/proxy/src/test/java/org/apache/accumulo/proxy/ProxyServerTest.java
index ed4f313..f656c32 100644
--- a/proxy/src/test/java/org/apache/accumulo/proxy/ProxyServerTest.java
+++ b/proxy/src/test/java/org/apache/accumulo/proxy/ProxyServerTest.java
@@ -48,7 +48,7 @@ public class ProxyServerTest {
MutationsRejectedException mre = EasyMock.createMock(MutationsRejectedException.class);
final ByteBuffer login = ByteBuffer.wrap("my_login".getBytes(UTF_8));
- final String tableName = "table1";
+ final String tableName = "table1";
final Map<ByteBuffer,List<ColumnUpdate>> cells = new HashMap<ByteBuffer,List<ColumnUpdate>>();
EasyMock.expect(server.getWriter(login, tableName, null)).andReturn(bwpe);
@@ -83,7 +83,7 @@ public class ProxyServerTest {
MutationsRejectedException mre = EasyMock.createMock(MutationsRejectedException.class);
final ByteBuffer login = ByteBuffer.wrap("my_login".getBytes(UTF_8));
- final String tableName = "table1";
+ final String tableName = "table1";
final Map<ByteBuffer,List<ColumnUpdate>> cells = new HashMap<ByteBuffer,List<ColumnUpdate>>();
EasyMock.expect(server.getWriter(login, tableName, null)).andReturn(bwpe);
@@ -110,5 +110,5 @@ public class ProxyServerTest {
EasyMock.verify(server, writer, mre);
}
-
+
}
[09/10] accumulo git commit: Merge branch '1.6' into 1.7
Posted by el...@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/9e08255f
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9e08255f
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/9e08255f
Branch: refs/heads/master
Commit: 9e08255f60fa3050b53c47832fea544c51ef363f
Parents: f9a29c7 244eeb6
Author: Josh Elser <el...@apache.org>
Authored: Thu May 28 14:09:40 2015 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Thu May 28 14:09:40 2015 -0400
----------------------------------------------------------------------
----------------------------------------------------------------------
[06/10] accumulo git commit: Merge branch '1.5' into 1.6
Posted by el...@apache.org.
Merge branch '1.5' into 1.6
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/244eeb67
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/244eeb67
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/244eeb67
Branch: refs/heads/1.6
Commit: 244eeb671b7fef7c682151a1f8c227ff1f39b673
Parents: 0cf5b9c 362b8ac
Author: Josh Elser <el...@apache.org>
Authored: Thu May 28 14:09:33 2015 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Thu May 28 14:09:33 2015 -0400
----------------------------------------------------------------------
.../test/java/org/apache/accumulo/proxy/ProxyServerTest.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
[10/10] accumulo git commit: Merge branch '1.7'
Posted by el...@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/0c7ddfe9
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0c7ddfe9
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0c7ddfe9
Branch: refs/heads/master
Commit: 0c7ddfe942483f109c404fe6fb091e63a606b7b9
Parents: 8c1d2d0 9e08255
Author: Josh Elser <el...@apache.org>
Authored: Thu May 28 14:09:47 2015 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Thu May 28 14:09:47 2015 -0400
----------------------------------------------------------------------
----------------------------------------------------------------------
[08/10] accumulo git commit: Merge branch '1.6' into 1.7
Posted by el...@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/9e08255f
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9e08255f
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/9e08255f
Branch: refs/heads/1.7
Commit: 9e08255f60fa3050b53c47832fea544c51ef363f
Parents: f9a29c7 244eeb6
Author: Josh Elser <el...@apache.org>
Authored: Thu May 28 14:09:40 2015 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Thu May 28 14:09:40 2015 -0400
----------------------------------------------------------------------
----------------------------------------------------------------------
[03/10] accumulo git commit: ACCUMULO-3856 Remove some trailing
whitespace (checkstyle failure)
Posted by el...@apache.org.
ACCUMULO-3856 Remove some trailing whitespace (checkstyle failure)
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/362b8ac3
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/362b8ac3
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/362b8ac3
Branch: refs/heads/1.7
Commit: 362b8ac334dec7d4be3d09d949972957ebb6c37a
Parents: 11f108e
Author: Josh Elser <el...@apache.org>
Authored: Thu May 28 14:09:20 2015 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Thu May 28 14:09:20 2015 -0400
----------------------------------------------------------------------
.../test/java/org/apache/accumulo/proxy/ProxyServerTest.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/362b8ac3/proxy/src/test/java/org/apache/accumulo/proxy/ProxyServerTest.java
----------------------------------------------------------------------
diff --git a/proxy/src/test/java/org/apache/accumulo/proxy/ProxyServerTest.java b/proxy/src/test/java/org/apache/accumulo/proxy/ProxyServerTest.java
index ed4f313..f656c32 100644
--- a/proxy/src/test/java/org/apache/accumulo/proxy/ProxyServerTest.java
+++ b/proxy/src/test/java/org/apache/accumulo/proxy/ProxyServerTest.java
@@ -48,7 +48,7 @@ public class ProxyServerTest {
MutationsRejectedException mre = EasyMock.createMock(MutationsRejectedException.class);
final ByteBuffer login = ByteBuffer.wrap("my_login".getBytes(UTF_8));
- final String tableName = "table1";
+ final String tableName = "table1";
final Map<ByteBuffer,List<ColumnUpdate>> cells = new HashMap<ByteBuffer,List<ColumnUpdate>>();
EasyMock.expect(server.getWriter(login, tableName, null)).andReturn(bwpe);
@@ -83,7 +83,7 @@ public class ProxyServerTest {
MutationsRejectedException mre = EasyMock.createMock(MutationsRejectedException.class);
final ByteBuffer login = ByteBuffer.wrap("my_login".getBytes(UTF_8));
- final String tableName = "table1";
+ final String tableName = "table1";
final Map<ByteBuffer,List<ColumnUpdate>> cells = new HashMap<ByteBuffer,List<ColumnUpdate>>();
EasyMock.expect(server.getWriter(login, tableName, null)).andReturn(bwpe);
@@ -110,5 +110,5 @@ public class ProxyServerTest {
EasyMock.verify(server, writer, mre);
}
-
+
}
[04/10] accumulo git commit: ACCUMULO-3856 Remove some trailing
whitespace (checkstyle failure)
Posted by el...@apache.org.
ACCUMULO-3856 Remove some trailing whitespace (checkstyle failure)
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/362b8ac3
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/362b8ac3
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/362b8ac3
Branch: refs/heads/master
Commit: 362b8ac334dec7d4be3d09d949972957ebb6c37a
Parents: 11f108e
Author: Josh Elser <el...@apache.org>
Authored: Thu May 28 14:09:20 2015 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Thu May 28 14:09:20 2015 -0400
----------------------------------------------------------------------
.../test/java/org/apache/accumulo/proxy/ProxyServerTest.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/362b8ac3/proxy/src/test/java/org/apache/accumulo/proxy/ProxyServerTest.java
----------------------------------------------------------------------
diff --git a/proxy/src/test/java/org/apache/accumulo/proxy/ProxyServerTest.java b/proxy/src/test/java/org/apache/accumulo/proxy/ProxyServerTest.java
index ed4f313..f656c32 100644
--- a/proxy/src/test/java/org/apache/accumulo/proxy/ProxyServerTest.java
+++ b/proxy/src/test/java/org/apache/accumulo/proxy/ProxyServerTest.java
@@ -48,7 +48,7 @@ public class ProxyServerTest {
MutationsRejectedException mre = EasyMock.createMock(MutationsRejectedException.class);
final ByteBuffer login = ByteBuffer.wrap("my_login".getBytes(UTF_8));
- final String tableName = "table1";
+ final String tableName = "table1";
final Map<ByteBuffer,List<ColumnUpdate>> cells = new HashMap<ByteBuffer,List<ColumnUpdate>>();
EasyMock.expect(server.getWriter(login, tableName, null)).andReturn(bwpe);
@@ -83,7 +83,7 @@ public class ProxyServerTest {
MutationsRejectedException mre = EasyMock.createMock(MutationsRejectedException.class);
final ByteBuffer login = ByteBuffer.wrap("my_login".getBytes(UTF_8));
- final String tableName = "table1";
+ final String tableName = "table1";
final Map<ByteBuffer,List<ColumnUpdate>> cells = new HashMap<ByteBuffer,List<ColumnUpdate>>();
EasyMock.expect(server.getWriter(login, tableName, null)).andReturn(bwpe);
@@ -110,5 +110,5 @@ public class ProxyServerTest {
EasyMock.verify(server, writer, mre);
}
-
+
}
[02/10] accumulo git commit: ACCUMULO-3856 Remove some trailing
whitespace (checkstyle failure)
Posted by el...@apache.org.
ACCUMULO-3856 Remove some trailing whitespace (checkstyle failure)
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/362b8ac3
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/362b8ac3
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/362b8ac3
Branch: refs/heads/1.6
Commit: 362b8ac334dec7d4be3d09d949972957ebb6c37a
Parents: 11f108e
Author: Josh Elser <el...@apache.org>
Authored: Thu May 28 14:09:20 2015 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Thu May 28 14:09:20 2015 -0400
----------------------------------------------------------------------
.../test/java/org/apache/accumulo/proxy/ProxyServerTest.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/362b8ac3/proxy/src/test/java/org/apache/accumulo/proxy/ProxyServerTest.java
----------------------------------------------------------------------
diff --git a/proxy/src/test/java/org/apache/accumulo/proxy/ProxyServerTest.java b/proxy/src/test/java/org/apache/accumulo/proxy/ProxyServerTest.java
index ed4f313..f656c32 100644
--- a/proxy/src/test/java/org/apache/accumulo/proxy/ProxyServerTest.java
+++ b/proxy/src/test/java/org/apache/accumulo/proxy/ProxyServerTest.java
@@ -48,7 +48,7 @@ public class ProxyServerTest {
MutationsRejectedException mre = EasyMock.createMock(MutationsRejectedException.class);
final ByteBuffer login = ByteBuffer.wrap("my_login".getBytes(UTF_8));
- final String tableName = "table1";
+ final String tableName = "table1";
final Map<ByteBuffer,List<ColumnUpdate>> cells = new HashMap<ByteBuffer,List<ColumnUpdate>>();
EasyMock.expect(server.getWriter(login, tableName, null)).andReturn(bwpe);
@@ -83,7 +83,7 @@ public class ProxyServerTest {
MutationsRejectedException mre = EasyMock.createMock(MutationsRejectedException.class);
final ByteBuffer login = ByteBuffer.wrap("my_login".getBytes(UTF_8));
- final String tableName = "table1";
+ final String tableName = "table1";
final Map<ByteBuffer,List<ColumnUpdate>> cells = new HashMap<ByteBuffer,List<ColumnUpdate>>();
EasyMock.expect(server.getWriter(login, tableName, null)).andReturn(bwpe);
@@ -110,5 +110,5 @@ public class ProxyServerTest {
EasyMock.verify(server, writer, mre);
}
-
+
}
[07/10] accumulo git commit: Merge branch '1.5' into 1.6
Posted by el...@apache.org.
Merge branch '1.5' into 1.6
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/244eeb67
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/244eeb67
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/244eeb67
Branch: refs/heads/master
Commit: 244eeb671b7fef7c682151a1f8c227ff1f39b673
Parents: 0cf5b9c 362b8ac
Author: Josh Elser <el...@apache.org>
Authored: Thu May 28 14:09:33 2015 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Thu May 28 14:09:33 2015 -0400
----------------------------------------------------------------------
.../test/java/org/apache/accumulo/proxy/ProxyServerTest.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
[05/10] accumulo git commit: Merge branch '1.5' into 1.6
Posted by el...@apache.org.
Merge branch '1.5' into 1.6
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/244eeb67
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/244eeb67
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/244eeb67
Branch: refs/heads/1.7
Commit: 244eeb671b7fef7c682151a1f8c227ff1f39b673
Parents: 0cf5b9c 362b8ac
Author: Josh Elser <el...@apache.org>
Authored: Thu May 28 14:09:33 2015 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Thu May 28 14:09:33 2015 -0400
----------------------------------------------------------------------
.../test/java/org/apache/accumulo/proxy/ProxyServerTest.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------