Return-Path: X-Original-To: apmail-incubator-accumulo-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-accumulo-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 0A9B39211 for ; Thu, 1 Mar 2012 22:04:03 +0000 (UTC) Received: (qmail 62486 invoked by uid 500); 1 Mar 2012 22:04:03 -0000 Delivered-To: apmail-incubator-accumulo-commits-archive@incubator.apache.org Received: (qmail 62460 invoked by uid 500); 1 Mar 2012 22:04:03 -0000 Mailing-List: contact accumulo-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: accumulo-dev@incubator.apache.org Delivered-To: mailing list accumulo-commits@incubator.apache.org Received: (qmail 62452 invoked by uid 99); 1 Mar 2012 22:04:02 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Mar 2012 22:04:02 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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, 01 Mar 2012 22:04:01 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 7A09523889EA; Thu, 1 Mar 2012 22:03:41 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1295936 - in /incubator/accumulo/trunk: ./ src/core/ src/packages/deb/accumulo-native/postinst src/packages/deb/accumulo/postinst src/server/ Date: Thu, 01 Mar 2012 22:03:41 -0000 To: accumulo-commits@incubator.apache.org From: vines@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120301220341.7A09523889EA@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: vines Date: Thu Mar 1 22:03:40 2012 New Revision: 1295936 URL: http://svn.apache.org/viewvc?rev=1295936&view=rev Log: merging ACCUMULO-435 Modified: incubator/accumulo/trunk/ (props changed) incubator/accumulo/trunk/src/core/ (props changed) incubator/accumulo/trunk/src/packages/deb/accumulo-native/postinst incubator/accumulo/trunk/src/packages/deb/accumulo/postinst incubator/accumulo/trunk/src/server/ (props changed) Propchange: incubator/accumulo/trunk/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Mar 1 22:03:40 2012 @@ -1,3 +1,3 @@ /incubator/accumulo/branches/1.3:1190280,1190413,1190420,1190427,1190500,1195622,1195625,1195629,1195635,1196044,1196054,1196057,1196071-1196072,1196106,1197066,1198935,1199383,1203683,1204625,1205547,1205880,1206169,1208031,1209124,1209526,1209532,1209539,1209541,1209587,1209657,1210518,1210571,1210596,1210598,1213424,1214320,1225006,1227215,1227231,1227611,1228195,1230180,1230736,1231043,1236873,1245632 /incubator/accumulo/branches/1.3.5rc:1209938 -/incubator/accumulo/branches/1.4:1201902-1295918 +/incubator/accumulo/branches/1.4:1201902-1295933 Propchange: incubator/accumulo/trunk/src/core/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Mar 1 22:03:40 2012 @@ -1,3 +1,3 @@ /incubator/accumulo/branches/1.3/src/core:1190280,1190413,1190420,1190427,1190500,1195622,1195625,1195629,1195635,1196044,1196054,1196057,1196071-1196072,1196106,1197066,1198935,1199383,1203683,1204625,1205547,1205880,1206169,1208031,1209124,1209526,1209532,1209539,1209541,1209587,1209657,1210518,1210571,1210596,1210598,1213424,1214320,1225006,1227215 /incubator/accumulo/branches/1.3.5rc/src/core:1209938 -/incubator/accumulo/branches/1.4/src/core:1201902-1295918 +/incubator/accumulo/branches/1.4/src/core:1201902-1295933 Modified: incubator/accumulo/trunk/src/packages/deb/accumulo-native/postinst URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/packages/deb/accumulo-native/postinst?rev=1295936&r1=1295935&r2=1295936&view=diff ============================================================================== --- incubator/accumulo/trunk/src/packages/deb/accumulo-native/postinst (original) +++ incubator/accumulo/trunk/src/packages/deb/accumulo-native/postinst Thu Mar 1 22:03:40 2012 @@ -17,9 +17,9 @@ # postinst script for Apache Accumulo native libraries if [ -z $JAVA_HOME ]; then - JAVA_HOME=`!readlink -f /usr/bin/java` + JAVA_HOME=`readlink -f /usr/bin/java` JAVA_HOME=`dirname $JAVA_HOME` - JAVA_HOME=`ci $JAVA_HOME/../../; pwd` + JAVA_HOME=`cd $JAVA_HOME/../../; pwd` fi export JAVA_HOME cd /usr/lib/accumulo/src/server/src/main/c++ Modified: incubator/accumulo/trunk/src/packages/deb/accumulo/postinst URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/packages/deb/accumulo/postinst?rev=1295936&r1=1295935&r2=1295936&view=diff ============================================================================== --- incubator/accumulo/trunk/src/packages/deb/accumulo/postinst (original) +++ incubator/accumulo/trunk/src/packages/deb/accumulo/postinst Thu Mar 1 22:03:40 2012 @@ -27,9 +27,9 @@ ln -fs /var/log/accumulo/logs /usr/lib/a ln -fs /var/log/accumulo/walogs /usr/lib/accumulo/walogs if [ -z $JAVA_HOME ]; then - JAVA_HOME=`!readlink -f /usr/bin/java` + JAVA_HOME=`readlink -f /usr/bin/java` JAVA_HOME=`dirname $JAVA_HOME` - JAVA_HOME=`ci $JAVA_HOME/../../; pwd` + JAVA_HOME=`cd $JAVA_HOME/../../; pwd` fi if [ -z $ZOOKEEPER_HOME ]; then ZOOKEEPER_HOME="/usr/lib/zookeeper" Propchange: incubator/accumulo/trunk/src/server/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Mar 1 22:03:40 2012 @@ -1,3 +1,3 @@ /incubator/accumulo/branches/1.3/src/server:1190280,1190413,1190420,1190427,1190500,1195622,1195625,1195629,1195635,1196044,1196054,1196057,1196071-1196072,1196106,1197066,1198935,1199383,1203683,1204625,1205547,1205880,1206169,1208031,1209124,1209526,1209532,1209539,1209541,1209587,1209657,1210518,1210571,1210596,1210598,1213424,1214320,1225006,1227215,1227231,1227611 /incubator/accumulo/branches/1.3.5rc/src/server:1209938 -/incubator/accumulo/branches/1.4/src/server:1201902-1295918 +/incubator/accumulo/branches/1.4/src/server:1201902-1295933