Return-Path: Delivered-To: apmail-incubator-hama-commits-archive@minotaur.apache.org Received: (qmail 61111 invoked from network); 21 Oct 2010 01:29:41 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 21 Oct 2010 01:29:41 -0000 Received: (qmail 20435 invoked by uid 500); 21 Oct 2010 01:29:41 -0000 Delivered-To: apmail-incubator-hama-commits-archive@incubator.apache.org Received: (qmail 20401 invoked by uid 500); 21 Oct 2010 01:29:40 -0000 Mailing-List: contact hama-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: hama-dev@incubator.apache.org Delivered-To: mailing list hama-commits@incubator.apache.org Received: (qmail 20392 invoked by uid 99); 21 Oct 2010 01:29:40 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 21 Oct 2010 01:29:40 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 21 Oct 2010 01:29:40 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 2A08E2388A1C; Thu, 21 Oct 2010 01:28:44 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1025809 - in /incubator/hama/trunk: CHANGES.txt conf/hama-env.sh Date: Thu, 21 Oct 2010 01:28:44 -0000 To: hama-commits@incubator.apache.org From: edwardyoon@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20101021012844.2A08E2388A1C@eris.apache.org> Author: edwardyoon Date: Thu Oct 21 01:28:43 2010 New Revision: 1025809 URL: http://svn.apache.org/viewvc?rev=1025809&view=rev Log: Remove HBASE_CONF_DIR and HBASE_HEAPSIZE from the hama.env Modified: incubator/hama/trunk/CHANGES.txt incubator/hama/trunk/conf/hama-env.sh Modified: incubator/hama/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/incubator/hama/trunk/CHANGES.txt?rev=1025809&r1=1025808&r2=1025809&view=diff ============================================================================== --- incubator/hama/trunk/CHANGES.txt (original) +++ incubator/hama/trunk/CHANGES.txt Thu Oct 21 01:28:43 2010 @@ -172,6 +172,7 @@ Trunk (unreleased changes) BUG FIXES + HAMA-317: Remove HBASE_CONF_DIR and HBASE_HEAPSIZE properties (edwardyoon) HAMA-315: Uncomment code in checkLocalDirs() (edwardyoon) HAMA-314: Remove unnecessary methods from HamaConfiguration (edwardyoon) HAMA-307: BSPMaster - job ID counter is not read and updated atomically Modified: incubator/hama/trunk/conf/hama-env.sh URL: http://svn.apache.org/viewvc/incubator/hama/trunk/conf/hama-env.sh?rev=1025809&r1=1025808&r2=1025809&view=diff ============================================================================== --- incubator/hama/trunk/conf/hama-env.sh (original) +++ incubator/hama/trunk/conf/hama-env.sh Thu Oct 21 01:28:43 2010 @@ -27,14 +27,8 @@ # hadoop conf dir. to find the mapreduce cluster. # export HADOOP_CONF_DIR=/usr/local/src/hadoop-0.20.1/conf -# hbase conf dir. to find the hbase cluster. -# export HBASE_CONF_DIR=/usr/local/src/hbase-0.20.3/conf - # Extra Java CLASSPATH elements. Optional. -# export HAMA_CLASSPATH=$HADOOP_CONF_DIR:$HBASE_CONF_DIR - -# The maximum amount of heap to use, in MB. Default is 1000. -# export HBASE_HEAPSIZE=1000 +# export HAMA_CLASSPATH=$HADOOP_CONF_DIR # Where log files are stored. $HAMA_HOME/logs by default. # export HAMA_LOG_DIR=${HAMA_HOME}/logs