svn commit: r1477405 - in /accumulo/trunk: ./ start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloReloadingVFSClassLoader.java

[vines]

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;