Merge remote-tracking branch 'neo4j/3.0' into 3.1

neo4j · Jan 17, 2017 · 25f6bc4 · 25f6bc4
2 parents 8a29150 + 3695ff7
commit 25f6bc4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/...ging/standalone/standalone-community/src/main/distribution/text/community/conf/neo4j.conf b/...ging/standalone/standalone-community/src/main/distribution/text/community/conf/neo4j.conf
@@ -177,7 +177,8 @@ dbms.jvm.additional=-XX:+TrustFinalNonStaticFields
 # Disable explicit garbage collection, which is occasionally invoked by the JDK itself.
 dbms.jvm.additional=-XX:+DisableExplicitGC
 
-# Remote JMX monitoring, uncomment and adjust the following lines as needed.
+# Remote JMX monitoring, uncomment and adjust the following lines as needed. Absolute paths to jmx.access and
+# jmx.password files are required.
 # Also make sure to update the jmx.access and jmx.password files with appropriate permission roles and passwords,
 # the shipped configuration contains only a read only role called 'monitor' with password 'Neo4j'.
 # For more details, see: http://download.oracle.com/javase/8/docs/technotes/guides/management/agent.html
@@ -188,8 +189,8 @@ dbms.jvm.additional=-XX:+DisableExplicitGC
 #dbms.jvm.additional=-Dcom.sun.management.jmxremote.port=3637
 #dbms.jvm.additional=-Dcom.sun.management.jmxremote.authenticate=true
 #dbms.jvm.additional=-Dcom.sun.management.jmxremote.ssl=false
-#dbms.jvm.additional=-Dcom.sun.management.jmxremote.password.file=conf/jmx.password
-#dbms.jvm.additional=-Dcom.sun.management.jmxremote.access.file=conf/jmx.access
+#dbms.jvm.additional=-Dcom.sun.management.jmxremote.password.file=/absolute/path/to/conf/jmx.password
+#dbms.jvm.additional=-Dcom.sun.management.jmxremote.access.file=/absolute/path/to/conf/jmx.access
 
 # Some systems cannot discover host name automatically, and need this line configured:
 #dbms.jvm.additional=-Djava.rmi.server.hostname=$THE_NEO4J_SERVER_HOSTNAME

diff --git a/...ng/standalone/standalone-enterprise/src/main/distribution/text/enterprise/conf/neo4j.conf b/...ng/standalone/standalone-enterprise/src/main/distribution/text/enterprise/conf/neo4j.conf
@@ -538,7 +538,8 @@ dbms.jvm.additional=-XX:+TrustFinalNonStaticFields
 # Disable explicit garbage collection, which is occasionally invoked by the JDK itself.
 dbms.jvm.additional=-XX:+DisableExplicitGC
 
-# Remote JMX monitoring, uncomment and adjust the following lines as needed.
+# Remote JMX monitoring, uncomment and adjust the following lines as needed. Absolute paths to jmx.access and
+# jmx.password files are required.
 # Also make sure to update the jmx.access and jmx.password files with appropriate permission roles and passwords,
 # the shipped configuration contains only a read only role called 'monitor' with password 'Neo4j'.
 # For more details, see: http://download.oracle.com/javase/8/docs/technotes/guides/management/agent.html
@@ -549,8 +550,8 @@ dbms.jvm.additional=-XX:+DisableExplicitGC
 #dbms.jvm.additional=-Dcom.sun.management.jmxremote.port=3637
 #dbms.jvm.additional=-Dcom.sun.management.jmxremote.authenticate=true
 #dbms.jvm.additional=-Dcom.sun.management.jmxremote.ssl=false
-#dbms.jvm.additional=-Dcom.sun.management.jmxremote.password.file=conf/jmx.password
-#dbms.jvm.additional=-Dcom.sun.management.jmxremote.access.file=conf/jmx.access
+#dbms.jvm.additional=-Dcom.sun.management.jmxremote.password.file=/absolute/path/to/conf/jmx.password
+#dbms.jvm.additional=-Dcom.sun.management.jmxremote.access.file=/absolute/path/to/conf/jmx.access
 
 # Some systems cannot discover host name automatically, and need this line configured:
 #dbms.jvm.additional=-Djava.rmi.server.hostname=$THE_NEO4J_SERVER_HOSTNAME