From e5fb280ec82072fdd3373136a41f96c9536a1592 Mon Sep 17 00:00:00 2001 From: Matei Zaharia Date: Sat, 16 Oct 2010 21:51:25 -0700 Subject: Changed the config files that were included in git to templates which are used to create an initial copy of each config file if the user does not have one. This way, users won't accidentally commit their changes to config files to git. --- conf/java-opts | 0 conf/java-opts.template | 0 conf/log4j.properties | 8 -------- conf/log4j.properties.template | 8 ++++++++ conf/spark-env.sh | 13 ------------- conf/spark-env.sh.template | 13 +++++++++++++ 6 files changed, 21 insertions(+), 21 deletions(-) delete mode 100644 conf/java-opts create mode 100644 conf/java-opts.template delete mode 100644 conf/log4j.properties create mode 100644 conf/log4j.properties.template delete mode 100755 conf/spark-env.sh create mode 100755 conf/spark-env.sh.template (limited to 'conf') diff --git a/conf/java-opts b/conf/java-opts deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/conf/java-opts.template b/conf/java-opts.template new file mode 100644 index 0000000000..e69de29bb2 diff --git a/conf/log4j.properties b/conf/log4j.properties deleted file mode 100644 index d72dbadc39..0000000000 --- a/conf/log4j.properties +++ /dev/null @@ -1,8 +0,0 @@ -# Set everything to be logged to the console -log4j.rootCategory=INFO, console -log4j.appender.console=org.apache.log4j.ConsoleAppender -log4j.appender.console.layout=org.apache.log4j.PatternLayout -log4j.appender.console.layout.ConversionPattern=%d{yy/MM/dd HH:mm:ss} %p %c{1}: %m%n - -# Ignore messages below warning level from Jetty, because it's a bit verbose -log4j.logger.org.eclipse.jetty=WARN diff --git a/conf/log4j.properties.template b/conf/log4j.properties.template new file mode 100644 index 0000000000..d72dbadc39 --- /dev/null +++ b/conf/log4j.properties.template @@ -0,0 +1,8 @@ +# Set everything to be logged to the console +log4j.rootCategory=INFO, console +log4j.appender.console=org.apache.log4j.ConsoleAppender +log4j.appender.console.layout=org.apache.log4j.PatternLayout +log4j.appender.console.layout.ConversionPattern=%d{yy/MM/dd HH:mm:ss} %p %c{1}: %m%n + +# Ignore messages below warning level from Jetty, because it's a bit verbose +log4j.logger.org.eclipse.jetty=WARN diff --git a/conf/spark-env.sh b/conf/spark-env.sh deleted file mode 100755 index 6852b23a34..0000000000 --- a/conf/spark-env.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/env bash - -# Set Spark environment variables for your site in this file. Some useful -# variables to set are: -# - MESOS_HOME, to point to your Mesos installation -# - SCALA_HOME, to point to your Scala installation -# - SPARK_CLASSPATH, to add elements to Spark's classpath -# - SPARK_JAVA_OPTS, to add JVM options -# - SPARK_MEM, to change the amount of memory used per node (this should -# be in the same format as the JVM's -Xmx option, e.g. 300m or 1g). -# - SPARK_LIBRARY_PATH, to add extra search paths for native libraries. - - diff --git a/conf/spark-env.sh.template b/conf/spark-env.sh.template new file mode 100755 index 0000000000..6852b23a34 --- /dev/null +++ b/conf/spark-env.sh.template @@ -0,0 +1,13 @@ +#!/usr/bin/env bash + +# Set Spark environment variables for your site in this file. Some useful +# variables to set are: +# - MESOS_HOME, to point to your Mesos installation +# - SCALA_HOME, to point to your Scala installation +# - SPARK_CLASSPATH, to add elements to Spark's classpath +# - SPARK_JAVA_OPTS, to add JVM options +# - SPARK_MEM, to change the amount of memory used per node (this should +# be in the same format as the JVM's -Xmx option, e.g. 300m or 1g). +# - SPARK_LIBRARY_PATH, to add extra search paths for native libraries. + + -- cgit v1.2.3