Author: ctubbsii
Date: Sat May 18 02:32:36 2013
New Revision: 1484045
URL: http://svn.apache.org/r1484045
Log:
ACCUMULO-970 clean up svn mergeinfo from 1.5.0-RC3 rollback
Modified:
accumulo/trunk/ (props changed)
accumulo/trunk/assemble/ (props changed)
accumulo/trunk/core/ (props changed)
accumulo/trunk/examples/ (props changed)
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
(props changed)
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
(props changed)
accumulo/trunk/pom.xml (props changed)
accumulo/trunk/proxy/README (props changed)
accumulo/trunk/server/ (props changed)
accumulo/trunk/src/ (props changed)
Propchange: accumulo/trunk/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5:r1483627,1483630,1483632-1483633,1484043
Propchange: accumulo/trunk/assemble/
------------------------------------------------------------------------------
Merged
/accumulo/branches/1.5/assemble:r1483627,1483630,1483632-1483633,1484043
Propchange: accumulo/trunk/core/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/core:r1483627,1483630,1483632-1483633,1484043
Propchange: accumulo/trunk/examples/
------------------------------------------------------------------------------
Merged
/accumulo/branches/1.5/examples:r1483627,1483630,1483632-1483633,1484043
Propchange:
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
------------------------------------------------------------------------------
Merged
/accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1483627,1483630,1483632-1483633,1484043
Propchange:
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
------------------------------------------------------------------------------
Merged
/accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java:r1483627,1483630,1483632-1483633,1484043
Propchange: accumulo/trunk/pom.xml
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/pom.xml:r1483627,1483630,1483632-1483633,1484043
Propchange: accumulo/trunk/proxy/README
------------------------------------------------------------------------------
Merged
/accumulo/branches/1.5/proxy/README:r1483627,1483630,1483632-1483633,1484043
Propchange: accumulo/trunk/server/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/server:r1483627,1483630,1483632-1483633,1484043
Propchange: accumulo/trunk/src/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/src:r1483627,1483630,1483632-1483633,1484043
