This is an automated email from the ASF dual-hosted git repository.
jonwei pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-druid.git
The following commit(s) were added to refs/heads/master by this push:
new c034ed8 fix a couple of missed changes that should been in #6443
(#6487)
c034ed8 is described below
commit c034ed8c439caf128ff7aaca9863a2a9b83d05ac
Author: Clint Wylie <[email protected]>
AuthorDate: Wed Oct 17 16:22:17 2018 -0700
fix a couple of missed changes that should been in #6443 (#6487)
---
CONTRIBUTING.md | 2 +-
INTELLIJ_SETUP.md | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index c6973a9..59a4ad0 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -12,7 +12,7 @@ When submitting a pull request (PR), please use the following
guidelines:
Non-trivial features should include unit tests covering the new
functionality.
- Bugfixes should include a unit test or integration test reproducing the
issue.
- Do not use author tags/information in the code.
-- Always include license header on each java file your create. See [this
example](https://github.com/apache/incubator-druid/blob/master/common/src/main/java/org/apache/druid/metadata/PasswordProvider.java)
+- Always include license header on each java file your create. See [this
example](https://github.com/apache/incubator-druid/blob/master/core/src/main/java/org/apache/druid/metadata/PasswordProvider.java)
- Try to keep pull requests short and submit separate ones for unrelated
features, but feel free to combine simple bugfixes/tests into one pull
request.
- Keep the number of commits small and combine commits for related changes.
diff --git a/INTELLIJ_SETUP.md b/INTELLIJ_SETUP.md
index e1cbeb6..8ee3c4d 100644
--- a/INTELLIJ_SETUP.md
+++ b/INTELLIJ_SETUP.md
@@ -34,7 +34,7 @@ You can configure application definitions in XML for import
into IntelliJ. Below
<configuration default="false" name="Historical" type="Application"
factoryName="Application">
<extension name="coverage" enabled="false" merge="false"
sample_coverage="true" runner="idea" />
<option name="MAIN_CLASS_NAME" value="org.apache.druid.cli.Main" />
- <option name="VM_PARAMETERS" value="-server -Duser.timezone=UTC
-Dfile.encoding=UTF-8 -Xmx2G -XX:MaxJavaStackTraceDepth=9999 -XX:+UseG1GC
-XX:+PrintGCDetails -XX:+PrintGCTimeStamps -XX:+PrintAdaptiveSizePolicy
-XX:+PrintReferenceGC -verbose:gc -XX:+PrintFlagsFinal
-Djava.util.logging.manager=org.apache.logging.log4j.jul.LogManager
-Dorg.jboss.logging.provider=slf4j
-Dlog4j.configurationFile=$PROJECT_DIR$/common/src/main/resources/log4j2.debug.xml
-Ddruid.host=localhost -Ddruid.servic [...]
+ <option name="VM_PARAMETERS" value="-server -Duser.timezone=UTC
-Dfile.encoding=UTF-8 -Xmx2G -XX:MaxJavaStackTraceDepth=9999 -XX:+UseG1GC
-XX:+PrintGCDetails -XX:+PrintGCTimeStamps -XX:+PrintAdaptiveSizePolicy
-XX:+PrintReferenceGC -verbose:gc -XX:+PrintFlagsFinal
-Djava.util.logging.manager=org.apache.logging.log4j.jul.LogManager
-Dorg.jboss.logging.provider=slf4j
-Dlog4j.configurationFile=$PROJECT_DIR$/core/src/main/resources/log4j2.debug.xml
-Ddruid.host=localhost -Ddruid.service= [...]
<option name="PROGRAM_PARAMETERS" value="server historical" />
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
