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/06/27 00:38:35 UTC
[1/6] git commit: ACCUMULO-2658 Don't read more than the configured
maximum amount of data for the proxy thrift server
Repository: accumulo
Updated Branches:
refs/heads/1.5.2-SNAPSHOT e01a72062 -> 727bbf713
refs/heads/1.6.1-SNAPSHOT 2a17a7a2b -> c8b788189
refs/heads/master ab6ea922f -> f295f8fe5
ACCUMULO-2658 Don't read more than the configured maximum amount of data for the proxy thrift server
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/727bbf71
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/727bbf71
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/727bbf71
Branch: refs/heads/1.5.2-SNAPSHOT
Commit: 727bbf7130766f85e56efe4b19f8c0ea56369c16
Parents: e01a720
Author: Josh Elser <el...@apache.org>
Authored: Thu Jun 26 18:20:39 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Thu Jun 26 18:21:36 2014 -0400
----------------------------------------------------------------------
proxy/src/main/java/org/apache/accumulo/proxy/Proxy.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/727bbf71/proxy/src/main/java/org/apache/accumulo/proxy/Proxy.java
----------------------------------------------------------------------
diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/Proxy.java b/proxy/src/main/java/org/apache/accumulo/proxy/Proxy.java
index f6744b6..7b0a1ed 100644
--- a/proxy/src/main/java/org/apache/accumulo/proxy/Proxy.java
+++ b/proxy/src/main/java/org/apache/accumulo/proxy/Proxy.java
@@ -141,6 +141,7 @@ public class Proxy {
throw new RuntimeException(maxFrameSize + " is larger than MAX_INT");
args.transportFactory(new TFramedTransport.Factory((int)maxFrameSize));
args.protocolFactory(protoClass.newInstance());
+ args.maxReadBufferBytes = maxFrameSize;
return new THsHaServer(args);
}
}
[5/6] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT
Posted by el...@apache.org.
Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c8b78818
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c8b78818
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c8b78818
Branch: refs/heads/1.6.1-SNAPSHOT
Commit: c8b788189e6816cf810bb34959135f07f3bbe4e7
Parents: 2a17a7a 727bbf7
Author: Josh Elser <el...@apache.org>
Authored: Thu Jun 26 18:21:46 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Thu Jun 26 18:21:46 2014 -0400
----------------------------------------------------------------------
proxy/src/main/java/org/apache/accumulo/proxy/Proxy.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/c8b78818/proxy/src/main/java/org/apache/accumulo/proxy/Proxy.java
----------------------------------------------------------------------
[4/6] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT
Posted by el...@apache.org.
Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c8b78818
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c8b78818
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c8b78818
Branch: refs/heads/master
Commit: c8b788189e6816cf810bb34959135f07f3bbe4e7
Parents: 2a17a7a 727bbf7
Author: Josh Elser <el...@apache.org>
Authored: Thu Jun 26 18:21:46 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Thu Jun 26 18:21:46 2014 -0400
----------------------------------------------------------------------
proxy/src/main/java/org/apache/accumulo/proxy/Proxy.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/c8b78818/proxy/src/main/java/org/apache/accumulo/proxy/Proxy.java
----------------------------------------------------------------------
[2/6] git commit: ACCUMULO-2658 Don't read more than the configured
maximum amount of data for the proxy thrift server
Posted by el...@apache.org.
ACCUMULO-2658 Don't read more than the configured maximum amount of data for the proxy thrift server
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/727bbf71
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/727bbf71
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/727bbf71
Branch: refs/heads/1.6.1-SNAPSHOT
Commit: 727bbf7130766f85e56efe4b19f8c0ea56369c16
Parents: e01a720
Author: Josh Elser <el...@apache.org>
Authored: Thu Jun 26 18:20:39 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Thu Jun 26 18:21:36 2014 -0400
----------------------------------------------------------------------
proxy/src/main/java/org/apache/accumulo/proxy/Proxy.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/727bbf71/proxy/src/main/java/org/apache/accumulo/proxy/Proxy.java
----------------------------------------------------------------------
diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/Proxy.java b/proxy/src/main/java/org/apache/accumulo/proxy/Proxy.java
index f6744b6..7b0a1ed 100644
--- a/proxy/src/main/java/org/apache/accumulo/proxy/Proxy.java
+++ b/proxy/src/main/java/org/apache/accumulo/proxy/Proxy.java
@@ -141,6 +141,7 @@ public class Proxy {
throw new RuntimeException(maxFrameSize + " is larger than MAX_INT");
args.transportFactory(new TFramedTransport.Factory((int)maxFrameSize));
args.protocolFactory(protoClass.newInstance());
+ args.maxReadBufferBytes = maxFrameSize;
return new THsHaServer(args);
}
}
[6/6] git commit: Merge branch '1.6.1-SNAPSHOT'
Posted by el...@apache.org.
Merge branch '1.6.1-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f295f8fe
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f295f8fe
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f295f8fe
Branch: refs/heads/master
Commit: f295f8fe5c4e2fe8ad07977dc3d4856899929f9b
Parents: ab6ea92 c8b7881
Author: Josh Elser <el...@apache.org>
Authored: Thu Jun 26 18:30:00 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Thu Jun 26 18:30:00 2014 -0400
----------------------------------------------------------------------
proxy/src/main/java/org/apache/accumulo/proxy/Proxy.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
[3/6] git commit: ACCUMULO-2658 Don't read more than the configured
maximum amount of data for the proxy thrift server
Posted by el...@apache.org.
ACCUMULO-2658 Don't read more than the configured maximum amount of data for the proxy thrift server
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/727bbf71
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/727bbf71
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/727bbf71
Branch: refs/heads/master
Commit: 727bbf7130766f85e56efe4b19f8c0ea56369c16
Parents: e01a720
Author: Josh Elser <el...@apache.org>
Authored: Thu Jun 26 18:20:39 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Thu Jun 26 18:21:36 2014 -0400
----------------------------------------------------------------------
proxy/src/main/java/org/apache/accumulo/proxy/Proxy.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/727bbf71/proxy/src/main/java/org/apache/accumulo/proxy/Proxy.java
----------------------------------------------------------------------
diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/Proxy.java b/proxy/src/main/java/org/apache/accumulo/proxy/Proxy.java
index f6744b6..7b0a1ed 100644
--- a/proxy/src/main/java/org/apache/accumulo/proxy/Proxy.java
+++ b/proxy/src/main/java/org/apache/accumulo/proxy/Proxy.java
@@ -141,6 +141,7 @@ public class Proxy {
throw new RuntimeException(maxFrameSize + " is larger than MAX_INT");
args.transportFactory(new TFramedTransport.Factory((int)maxFrameSize));
args.protocolFactory(protoClass.newInstance());
+ args.maxReadBufferBytes = maxFrameSize;
return new THsHaServer(args);
}
}