You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ct...@apache.org on 2013/05/21 22:29:00 UTC
svn commit: r1484940 - in /accumulo/trunk: ./ assemble/ core/
docs/src/main/latex/accumulo_developer_manual/ examples/
fate/src/main/java/org/apache/accumulo/fate/
fate/src/main/java/org/apache/accumulo/fate/zookeeper/ proxy/ server/ src/
Author: ctubbsii
Date: Tue May 21 20:28:59 2013
New Revision: 1484940
URL: http://svn.apache.org/r1484940
Log:
ACCUMULO-1187 merge to trunk
Removed:
accumulo/trunk/docs/src/main/latex/accumulo_developer_manual/
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:r1484905-1484907,1484909-1484915,1484917-1484938
Propchange: accumulo/trunk/assemble/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/assemble:r1484905-1484907,1484909-1484915,1484917-1484938
Propchange: accumulo/trunk/core/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/core:r1484867-1484907,1484909-1484915,1484917-1484938
Propchange: accumulo/trunk/examples/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/examples:r1484867-1484907,1484909-1484915,1484917-1484938
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:r1484297-1484330,1484332-1484336,1484340-1484579,1484581-1484907,1484909-1484915,1484917-1484938
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:r1484297-1484330,1484332-1484336,1484340-1484579,1484581-1484907,1484909-1484915,1484917-1484938
Propchange: accumulo/trunk/pom.xml
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/pom.xml:r1484905-1484907,1484909-1484915,1484917-1484938
Propchange: accumulo/trunk/proxy/README
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/proxy/README:r1484297-1484330,1484332-1484336,1484340-1484579,1484581-1484907,1484909-1484915,1484917-1484927,1484929-1484938
Propchange: accumulo/trunk/server/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/server:r1484905-1484907,1484909-1484915,1484917-1484938
Propchange: accumulo/trunk/src/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/src:r1484297-1484330,1484332-1484336,1484340-1484579,1484581-1484907,1484909-1484915,1484917-1484938