Author: ctubbsii
Date: Fri Jun 14 04:02:25 2013
New Revision: 1492948
URL: http://svn.apache.org/r1492948
Log:
ACCUMULO-1498 Fix more svn mergeinfo from 1.4 to 1.5
Modified:
accumulo/branches/1.5/ (props changed)
accumulo/branches/1.5/assemble/ (props changed)
accumulo/branches/1.5/core/ (props changed)
accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
(props changed)
accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
(props changed)
accumulo/branches/1.5/proxy/README (props changed)
accumulo/branches/1.5/server/ (props changed)
accumulo/branches/1.5/src/ (props changed)
Propchange: accumulo/branches/1.5/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.4:r1490758-1492947
Propchange: accumulo/branches/1.5/assemble/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.4/assemble:r1490758-1492947
Propchange: accumulo/branches/1.5/core/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.4/core:r1490758-1492947
Propchange:
accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
------------------------------------------------------------------------------
Merged
/accumulo/branches/1.4/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1490758-1492947
Propchange:
accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
------------------------------------------------------------------------------
Merged
/accumulo/branches/1.4/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java:r1490758-1492947
Propchange: accumulo/branches/1.5/proxy/README
------------------------------------------------------------------------------
Merged /accumulo/branches/1.4/proxy/README:r1490758-1492947
Propchange: accumulo/branches/1.5/server/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.4/server:r1490758-1492947
Propchange: accumulo/branches/1.5/src/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.4/src:r1490758-1492947
