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/06/14 06:20:55 UTC
svn commit: r1492949 - in /accumulo/trunk: ./ assemble/ core/ examples/
fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
pom.xml proxy/README server/ src/
Author: ctubbsii
Date: Fri Jun 14 04:20:55 2013
New Revision: 1492949
URL: http://svn.apache.org/r1492949
Log:
ACCUMULO-1498 Ensure 1.5 branch merges cleanly to trunk
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:r1492946-1492948
Merged /accumulo/branches/1.4:r1490758-1492947
Propchange: accumulo/trunk/assemble/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.4/assemble:r1490758-1492947
Merged /accumulo/branches/1.5/assemble:r1492946-1492948
Propchange: accumulo/trunk/core/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/core:r1492946-1492948
Merged /accumulo/branches/1.4/core:r1490758-1492947
Merged /accumulo/branches/1.4/src/core:r1356901-1358205
Propchange: accumulo/trunk/examples/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/examples:r1492946-1492948
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:r1492946-1492948
Merged /accumulo/branches/1.4/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1490758-1492947
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:r1492946-1492948
Merged /accumulo/branches/1.4/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java:r1490758-1492947
Propchange: accumulo/trunk/pom.xml
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/pom.xml:r1492946-1492948
Propchange: accumulo/trunk/proxy/README
------------------------------------------------------------------------------
Merged /accumulo/branches/1.4/proxy/README:r1490758-1492947
Merged /accumulo/branches/1.5/proxy/README:r1492946-1492948
Propchange: accumulo/trunk/server/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.4/server:r1490758-1492947
Merged /accumulo/branches/1.5/server:r1492946-1492948
Propchange: accumulo/trunk/src/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.4/src:r1490758-1492947
Merged /accumulo/branches/1.5/src:r1492946-1492948