This is an automated email from the ASF dual-hosted git repository.

mblow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git

commit f72e4cfaa0f2678f6e3ce3237b6c58bc94bad45c
Merge: 39eb84f 8ac45b4
Author: Michael Blow <[email protected]>
AuthorDate: Fri Feb 12 17:31:26 2021 -0500

    Merge branch 'gerrit/mad-hatter'
    
    Change-Id: I6d2c3a1fae5dd5310885a3d65797b0ebc80c9937

 .../asterix/common/config/ExternalProperties.java  |   3 +-
 .../hyracks/control/common/config/OptionTypes.java | 258 +++++++++++++--------
 2 files changed, 159 insertions(+), 102 deletions(-)

diff --cc 
asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/ExternalProperties.java
index c415437,642cbd6..9bef65d
--- 
a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/ExternalProperties.java
+++ 
b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/ExternalProperties.java
@@@ -46,8 -47,8 +47,8 @@@ public class ExternalProperties extend
          CC_JAVA_OPTS(STRING, "-Xmx1024m", "The JVM options passed to the 
cluster controller process by managix"),
          NC_JAVA_OPTS(STRING, "-Xmx1024m", "The JVM options passed to the node 
controller process(es) by managix"),
          MAX_WEB_REQUEST_SIZE(
-                 NONNEGATIVE_INTEGER,
+                 POSITIVE_INTEGER_BYTE_UNIT,
 -                StorageUtil.getIntSizeInBytes(50, 
StorageUtil.StorageUnit.MEGABYTE),
 +                StorageUtil.getIntSizeInBytes(200, 
StorageUtil.StorageUnit.MEGABYTE),
                  "The maximum accepted web request size in bytes"),
          REQUESTS_ARCHIVE_SIZE(NONNEGATIVE_INTEGER, 50, "The maximum number of 
archived requests to maintain");
  

Reply via email to