accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject svn commit: r1484635 - in /accumulo/trunk: ./ CHANGES 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/
Date Tue, 21 May 2013 01:21:19 GMT
Author: ctubbsii
Date: Tue May 21 01:21:18 2013
New Revision: 1484635

URL: http://svn.apache.org/r1484635
Log:
ACCUMULO-970 update merge info to trunk from 1.5.0-RC4 changes

Modified:
    accumulo/trunk/   (props changed)
    accumulo/trunk/CHANGES
    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:r1484331,1484337-1484339

Modified: accumulo/trunk/CHANGES
URL: http://svn.apache.org/viewvc/accumulo/trunk/CHANGES?rev=1484635&r1=1484634&r2=1484635&view=diff
==============================================================================
--- accumulo/trunk/CHANGES (original)
+++ accumulo/trunk/CHANGES Tue May 21 01:21:18 2013
@@ -14,4 +14,4 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-Release notes for Apache Accumulo 1.5.0
+Release Notes - Accumulo - Version 1.6.0

Propchange: accumulo/trunk/assemble/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/assemble:r1484331,1484337-1484339

Propchange: accumulo/trunk/core/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/core:r1484331,1484337-1484339

Propchange: accumulo/trunk/examples/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/examples:r1484331,1484337-1484339

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:r1484331,1484337-1484339

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:r1484331,1484337-1484339

Propchange: accumulo/trunk/pom.xml
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/pom.xml:r1484331,1484337-1484339

Propchange: accumulo/trunk/proxy/README
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/proxy/README:r1484331,1484337-1484339

Propchange: accumulo/trunk/server/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/server:r1484331,1484337-1484339

Propchange: accumulo/trunk/src/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/src:r1484331,1484337-1484339



Mime
View raw message