You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by ma...@apache.org on 2014/12/31 22:17:58 UTC
[1/2] incubator-nifi git commit: NIFI-217: Added PermGen properties
and property to enable G1GC but leave them commented out
Repository: incubator-nifi
Updated Branches:
refs/heads/develop 3004ff172 -> d3d10958a
NIFI-217: Added PermGen properties and property to enable G1GC but leave them commented out
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/e07b910a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/e07b910a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/e07b910a
Branch: refs/heads/develop
Commit: e07b910a55f4dd0063207018d3341c9940e72559
Parents: ebf3cdc
Author: Mark Payne <ma...@hotmail.com>
Authored: Wed Dec 31 16:08:39 2014 -0500
Committer: Mark Payne <ma...@hotmail.com>
Committed: Wed Dec 31 16:08:39 2014 -0500
----------------------------------------------------------------------
.../framework/resources/src/main/resources/conf/bootstrap.conf | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/e07b910a/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 79ece96..8568e64 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
@@ -32,3 +32,9 @@ java.arg.6=-Djava.protocol.handler.pkgs=sun.net.www.protocol
#java.arg.7=-XX:ReservedCodeCacheSize=256m
#java.arg.8=-XX:CodeCacheFlushingMinimumFreeSpace=10m
#java.arg.9=-XX:+UseCodeCacheFlushing
+#java.arg.11=-XX:PermSize=128M
+#java.arg.12=-XX:MaxPermSize=128M
+
+# The G1GC is still considered experimental but has proven to be very advantageous in providing great
+# performance without significant "stop-the-world" delays.
+#java.arg.10=-XX:+UseG1GC
\ No newline at end of file
[2/2] incubator-nifi git commit: Merge branch 'develop' of
https://git-wip-us.apache.org/repos/asf/incubator-nifi into develop
Posted by ma...@apache.org.
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/incubator-nifi into develop
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/d3d10958
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/d3d10958
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/d3d10958
Branch: refs/heads/develop
Commit: d3d10958a77e423f1c3844bbeb28c2b01afaf24c
Parents: e07b910 3004ff1
Author: Mark Payne <ma...@hotmail.com>
Authored: Wed Dec 31 16:17:51 2014 -0500
Committer: Mark Payne <ma...@hotmail.com>
Committed: Wed Dec 31 16:17:51 2014 -0500
----------------------------------------------------------------------
assembly/pom.xml | 1 +
.../org/apache/nifi/util/NiFiProperties.java | 6 +
.../src/main/resources/conf/nifi.properties | 1 +
.../org/apache/nifi/web/server/JettyServer.java | 2 +-
.../nifi/processors/standard/GetFile.java | 20 +-
.../index.html | 6 +-
nifi-docs/src/main/asciidoc/overview.adoc | 188 +++++++++++++------
7 files changed, 162 insertions(+), 62 deletions(-)
----------------------------------------------------------------------