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/04/22 19:55:00 UTC
svn commit: r1470639 - 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 server/ src/
Author: ctubbsii
Date: Mon Apr 22 17:55:00 2013
New Revision: 1470639
URL: http://svn.apache.org/r1470639
Log:
ACCUMULO-1315 merge 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 (contents, props changed)
accumulo/trunk/server/ (props changed)
accumulo/trunk/src/ (props changed)
Propchange: accumulo/trunk/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5:r1469651-1469795,1469797-1469850,1469852-1469859,1469861-1469906,1469908-1469966,1469968-1469969,1469971-1470606,1470608-1470617,1470619-1470631,1470633
Propchange: accumulo/trunk/assemble/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/assemble:r1467466-1468097,1468099-1468200,1468202-1468526,1468528-1468531,1468533-1468544,1468546-1468575,1468577-1468581,1468583-1468598,1468600-1468926,1468928-1468931,1468933,1468935-1468946,1468948-1468958,1468960-1468982,1468984-1468992,1468994,1468996-1469077,1469079,1469082-1469112,1469114-1469502,1469504-1469628,1469630-1469631,1469633-1469795,1469797-1469850,1469852-1469859,1469861-1469906,1469908-1469966,1469968-1469969,1469971-1470606,1470608-1470617,1470619-1470631,1470633
Propchange: accumulo/trunk/core/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/core:r1469651-1469795,1469797-1469850,1469852-1469859,1469861-1469906,1469908-1469966,1469968-1469969,1469971-1470606,1470608-1470617,1470619-1470631,1470633
Propchange: accumulo/trunk/examples/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/examples:r1467466-1468097,1468099-1468200,1468202-1468526,1468528-1468531,1468533-1468544,1468546-1468575,1468577-1468581,1468583-1468598,1468600-1468926,1468928-1468931,1468933,1468935-1468946,1468948-1468958,1468960-1468982,1468984-1468992,1468994,1468996-1469077,1469079,1469082-1469103,1469105-1469112,1469114-1469502,1469504-1469628,1469630-1469631,1469633-1469795,1469797-1469850,1469852-1469859,1469861-1469906,1469908-1469966,1469968-1469969,1469971-1470606,1470608-1470617,1470619-1470631,1470633
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:r1467466-1468097,1468099-1468200,1468202-1468526,1468528-1468531,1468533-1468544,1468546-1468575,1468577-1468581,1468583-1468598,1468600-1468926,1468928-1468931,1468933,1468935-1468946,1468948-1468958,1468960-1468982,1468984-1468992,1468994,1468996-1469077,1469079,1469082-1469103,1469105-1469112,1469114-1469502,1469504-1469628,1469630-1469631,1469633-1469795,1469797-1469850,1469852-1469859,1469861-1469906,1469908-1469966,1469968-1469969,1469971-1470606,1470608-1470617,1470619-1470631,1470633
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:r1467466-1468097,1468099-1468200,1468202-1468526,1468528-1468531,1468533-1468544,1468546-1468575,1468577-1468581,1468583-1468598,1468600-1468926,1468928-1468931,1468933,1468935-1468946,1468948-1468958,1468960-1468982,1468984-1468992,1468994,1468996-1469077,1469079,1469082-1469112,1469114-1469502,1469504-1469628,1469630-1469631,1469633-1469795,1469797-1469850,1469852-1469859,1469861-1469906,1469908-1469966,1469968-1469969,1469971-1470606,1470608-1470617,1470619-1470631,1470633
Modified: accumulo/trunk/pom.xml
URL: http://svn.apache.org/viewvc/accumulo/trunk/pom.xml?rev=1470639&r1=1470638&r2=1470639&view=diff
==============================================================================
--- accumulo/trunk/pom.xml (original)
+++ accumulo/trunk/pom.xml Mon Apr 22 17:55:00 2013
@@ -329,6 +329,20 @@
</configuration>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-changes-plugin</artifactId>
+ <version>2.9</version>
+ <configuration>
+ <issueManagementSystems>
+ <issueManagementSystem>JIRA</issueManagementSystem>
+ </issueManagementSystems>
+ <onlyCurrentVersion>true</onlyCurrentVersion>
+ <statusIds>Closed,Resolved</statusIds>
+ <maxEntries>10000</maxEntries>
+ <useJql>true</useJql>
+ </configuration>
+ </plugin>
+ <plugin>
<artifactId>maven-clean-plugin</artifactId>
<configuration>
<filesets>
@@ -383,6 +397,7 @@
</configuration>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<encoding>UTF-8</encoding>
@@ -608,17 +623,10 @@
</build>
<reporting>
<plugins>
- <!--
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-changes-plugin</artifactId>
<version>2.9</version>
- <configuration>
- <onlyCurrentVersion>true</onlyCurrentVersion>
- <statusIds>resolved</statusIds>
- <maxEntries>10000</maxEntries>
- <useJql>true</useJql>
- </configuration>
<reportSets>
<reportSet>
<reports>
@@ -627,7 +635,6 @@
</reportSet>
</reportSets>
</plugin>
- -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
Propchange: accumulo/trunk/pom.xml
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/pom.xml:r1467505-1468097,1468099-1468200,1468202-1468526,1468528-1468531,1468533-1468544,1468546-1468575,1468577-1468581,1468583-1468598,1468600-1468926,1468928-1468931,1468933,1468935-1468946,1468948-1468958,1468960-1468982,1468984-1468992,1468994,1468996-1469077,1469079,1469082-1469112,1469114-1469502,1469504-1469628,1469630-1469631,1469633-1469795,1469797-1469850,1469852-1469859,1469861-1469906,1469908-1469966,1469968-1469969,1469971-1470606,1470608-1470617,1470619-1470631,1470633
Propchange: accumulo/trunk/server/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/server:r1469651-1469795,1469797-1469850,1469852-1469859,1469861-1469906,1469908-1469966,1469968-1469969,1469971-1470606,1470608-1470617,1470619-1470631,1470633
Propchange: accumulo/trunk/src/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/src:r1467466-1468097,1468099-1468200,1468202-1468526,1468528-1468531,1468533-1468544,1468546-1468575,1468577-1468581,1468583-1468598,1468600-1468926,1468928-1468931,1468933,1468935-1468946,1468948-1468958,1468960-1468982,1468984-1468992,1468994,1468996-1469077,1469079,1469082-1469112,1469114-1469502,1469504-1469628,1469630-1469631,1469633-1469795,1469797-1469850,1469852-1469859,1469861-1469906,1469908-1469966,1469968-1469969,1469971-1470606,1470608-1470617,1470619-1470631,1470633