Return-Path: X-Original-To: apmail-accumulo-commits-archive@www.apache.org Delivered-To: apmail-accumulo-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A9BB11046F for ; Mon, 29 Apr 2013 23:03:43 +0000 (UTC) Received: (qmail 37593 invoked by uid 500); 29 Apr 2013 23:03:43 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 37550 invoked by uid 500); 29 Apr 2013 23:03:43 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 37523 invoked by uid 99); 29 Apr 2013 23:03:43 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 29 Apr 2013 23:03:43 +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; Mon, 29 Apr 2013 23:03:40 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id F09B823889FD; Mon, 29 Apr 2013 23:03:19 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1477405 - in /accumulo/trunk: ./ start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloReloadingVFSClassLoader.java Date: Mon, 29 Apr 2013 23:03:19 -0000 To: commits@accumulo.apache.org From: vines@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130429230319.F09B823889FD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: vines Date: Mon Apr 29 23:03:19 2013 New Revision: 1477405 URL: http://svn.apache.org/r1477405 Log: ACCUMULO-1321 - accidently commit a change to reloader time Modified: accumulo/trunk/ (props changed) accumulo/trunk/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloReloadingVFSClassLoader.java Propchange: accumulo/trunk/ ------------------------------------------------------------------------------ Merged /accumulo/branches/1.5:r1477404 Modified: accumulo/trunk/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloReloadingVFSClassLoader.java URL: http://svn.apache.org/viewvc/accumulo/trunk/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloReloadingVFSClassLoader.java?rev=1477405&r1=1477404&r2=1477405&view=diff ============================================================================== --- accumulo/trunk/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloReloadingVFSClassLoader.java (original) +++ accumulo/trunk/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloReloadingVFSClassLoader.java Mon Apr 29 23:03:19 2013 @@ -38,7 +38,7 @@ public class AccumuloReloadingVFSClassLo private static final Logger log = Logger.getLogger(AccumuloReloadingVFSClassLoader.class); /* 5 minute timeout */ - private static final int DEFAULT_TIMEOUT = 1000; + private static final int DEFAULT_TIMEOUT = 600000; private String uris; private FileObject[] files;