Author: ecn
Date: Thu Sep 20 17:32:06 2012
New Revision: 1388123
URL: http://svn.apache.org/viewvc?rev=1388123&view=rev
Log:
ACCUMULO-766 merge to trunk
Modified:
accumulo/trunk/ (props changed)
accumulo/trunk/core/ (props changed)
accumulo/trunk/server/ (props changed)
accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java
accumulo/trunk/src/ (props changed)
Propchange: accumulo/trunk/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.4/src:r1388120
Merged /accumulo/branches/1.4:r1388120
Propchange: accumulo/trunk/core/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.4/core:r1388120
Merged /accumulo/branches/1.4/src/core:r1388120
Propchange: accumulo/trunk/server/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.4/server:r1388120
Merged /accumulo/branches/1.4/src/server:r1388120
Modified:
accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java
URL:
http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java?rev=1388123&r1=1388122&r2=1388123&view=diff
==============================================================================
---
accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java
(original)
+++
accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java
Thu Sep 20 17:32:06 2012
@@ -279,6 +279,7 @@ public class LiveTServerSet implements W
current.remove(server);
info.cleanup();
}
+ ZooReaderWriter.getInstance().delete(lockPath, -1);
}
}
// log.debug("Current: " + current.keySet());
Propchange: accumulo/trunk/src/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.4/src:r1388120
Merged /accumulo/branches/1.4/src/src:r1388120
