svn merge -r2972:3096 https://hyracks.googlecode.com/svn/branches/fullstack_asterix_stabilization
git-svn-id: https://hyracks.googlecode.com/svn/branches/fullstack_genomix@3099 123451ca-8445-de46-9d55-352943316053
diff --git a/genomix/genomix-hyracks/src/main/resources/conf/cluster.properties b/genomix/genomix-hyracks/src/main/resources/conf/cluster.properties
index 2d0eb26..66251be 100644
--- a/genomix/genomix-hyracks/src/main/resources/conf/cluster.properties
+++ b/genomix/genomix-hyracks/src/main/resources/conf/cluster.properties
@@ -7,7 +7,7 @@
#The directory of hyracks binaries
HYRACKS_HOME="../../../../hyracks"
-WORKPATH="/mnt/data/sda/space/jjia/hyracks"
+WORKPATH=""
#The tmp directory for cc to install jars
CCTMP_DIR=${WORKPATH}/tmp/t1
@@ -21,7 +21,7 @@
NCLOGS_DIR=$NCTMP_DIR/logs
#Comma separated I/O directories for the spilling of external sort
-IO_DIRS="/mnt/data/sda/space/jjia/hyracks/tmp/t3,/mnt/data/sdb/space/jjia/hyracks/tmp/t3,/mnt/data/sdc/space/jjia/hyracks/tmp/t3,/mnt/data/sdd/space/jjia/hyracks/tmp/t3"
+IO_DIRS="${WORKPATH}/tmp/t3"
#The JAVA_HOME
JAVA_HOME=$JAVA_HOME
@@ -33,9 +33,9 @@
FRAME_SIZE=65536
#CC JAVA_OPTS
-CCJAVA_OPTS="-Xdebug -Xrunjdwp:transport=dt_socket,address=7001,server=y,suspend=n -Xmx1g -Djava.util.logging.config.file=logging.properties"
+CCJAVA_OPTS="-Xrunjdwp:transport=dt_socket,address=7001,server=y,suspend=n -Xmx1g -Djava.util.logging.config.file=logging.properties"
# Yourkit option: -agentpath:/grid/0/dev/vborkar/tools/yjp-10.0.4/bin/linux-x86-64/libyjpagent.so=port=20001"
#NC JAVA_OPTS
-NCJAVA_OPTS="-Xdebug -Xrunjdwp:transport=dt_socket,address=7002,server=y,suspend=n -Xmx10g -Djava.util.logging.config.file=logging.properties"
+NCJAVA_OPTS="-Xrunjdwp:transport=dt_socket,address=7002,server=y,suspend=n -Xmx10g -Djava.util.logging.config.file=logging.properties"
diff --git a/genomix/genomix-hyracks/src/main/resources/conf/master b/genomix/genomix-hyracks/src/main/resources/conf/master
index d71f20c..2fbb50c 100644
--- a/genomix/genomix-hyracks/src/main/resources/conf/master
+++ b/genomix/genomix-hyracks/src/main/resources/conf/master
@@ -1 +1 @@
-asterix-master
+localhost
diff --git a/genomix/genomix-hyracks/src/main/resources/conf/slaves b/genomix/genomix-hyracks/src/main/resources/conf/slaves
index d5272bc..2fbb50c 100644
--- a/genomix/genomix-hyracks/src/main/resources/conf/slaves
+++ b/genomix/genomix-hyracks/src/main/resources/conf/slaves
@@ -1,4 +1 @@
-asterix-001
-asterix-003
-asterix-002
-asterix-004
+localhost