Repository: incubator-nifi
Updated Branches:
  refs/heads/develop 21182ac26 -> c0e4618d4


NIFI-186 fixed extra + and made default mem sizes equal


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

Branch: refs/heads/develop
Commit: c0e4618d4233a2deb70e0ed44e2a936149f740cc
Parents: 21182ac
Author: joewitt <[email protected]>
Authored: Fri Dec 19 17:29:43 2014 -0500
Committer: joewitt <[email protected]>
Committed: Fri Dec 19 17:29:43 2014 -0500

----------------------------------------------------------------------
 .../framework/resources/src/main/resources/conf/bootstrap.conf   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c0e4618d/nar-bundles/framework-bundle/framework/resources/src/main/resources/conf/bootstrap.conf
----------------------------------------------------------------------
diff --git 
a/nar-bundles/framework-bundle/framework/resources/src/main/resources/conf/bootstrap.conf
 
b/nar-bundles/framework-bundle/framework/resources/src/main/resources/conf/bootstrap.conf
index 6208560..a34fa28 100644
--- 
a/nar-bundles/framework-bundle/framework/resources/src/main/resources/conf/bootstrap.conf
+++ 
b/nar-bundles/framework-bundle/framework/resources/src/main/resources/conf/bootstrap.conf
@@ -15,7 +15,7 @@ graceful.shutdown.seconds=20
 java.arg.1=-Dorg.apache.jasper.compiler.disablejsr199=true
 
 # JVM memory settings
-java.arg.2=-Xms256m
+java.arg.2=-Xms512m
 java.arg.3=-Xmx512m
 
 # Enable Remote Debugging
@@ -29,6 +29,6 @@ java.arg.6=-Djava.protocol.handler.pkgs=sun.net.www.protocol
 
 # Java 7 and below have issues with Code Cache. The following lines allow us 
to run well even with
 # many classes loaded in the JVM.
-java.arg.7=-XX:+ReservedCodeCacheSize=256m
+java.arg.7=-XX:ReservedCodeCacheSize=256m
 java.arg.8=-XX:CodeCacheFlushingMinimumFreeSpace=10m
 java.arg.9=-XX:+UseCodeCacheFlushing

Reply via email to