Author: elserj
Date: Thu May 30 01:55:23 2013
New Revision: 1487703
URL: http://svn.apache.org/r1487703
Log:
ACCUMULO-1166 Merge from 1.5 to trunk for source release updates and
minicluster artifact dependency
Modified:
accumulo/contrib/instamo-archetype/trunk/ (props changed)
accumulo/contrib/instamo-archetype/trunk/pom.xml
accumulo/contrib/instamo-archetype/trunk/src/main/resources/archetype-resources/pom.xml
accumulo/contrib/instamo-archetype/trunk/src/main/resources/archetype-resources/src/main/java/
(props changed)
accumulo/contrib/instamo-archetype/trunk/src/main/resources/archetype-resources/src/test/java/
(props changed)
Propchange: accumulo/contrib/instamo-archetype/trunk/
------------------------------------------------------------------------------
Merged
/accumulo/contrib/instamo-archetype/branches/1.5:r1479159-1487680,1487682-1487699
Merged /accumulo/contrib/instamo-archetype/branches/1.4:r1479141-1487697
Modified: accumulo/contrib/instamo-archetype/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/accumulo/contrib/instamo-archetype/trunk/pom.xml?rev=1487703&r1=1487702&r2=1487703&view=diff
==============================================================================
Binary files - no diff available.
Modified:
accumulo/contrib/instamo-archetype/trunk/src/main/resources/archetype-resources/pom.xml
URL:
http://svn.apache.org/viewvc/accumulo/contrib/instamo-archetype/trunk/src/main/resources/archetype-resources/pom.xml?rev=1487703&r1=1487702&r2=1487703&view=diff
==============================================================================
Binary files - no diff available.
Propchange:
accumulo/contrib/instamo-archetype/trunk/src/main/resources/archetype-resources/src/main/java/
------------------------------------------------------------------------------
Merged
/accumulo/contrib/instamo-archetype/branches/1.5/src/main/resources/archetype-resources/src/main/java:r1479159-1487680,1487682-1487699
Merged
/accumulo/contrib/instamo-archetype/branches/1.4/src/main/resources/archetype-resources/src/main/java:r1479141-1487694
Propchange:
accumulo/contrib/instamo-archetype/trunk/src/main/resources/archetype-resources/src/test/java/
------------------------------------------------------------------------------
Merged
/accumulo/contrib/instamo-archetype/branches/1.5/src/main/resources/archetype-resources/src/test/java:r1479159-1487680,1487682-1487699
Merged
/accumulo/contrib/instamo-archetype/branches/1.4/src/main/resources/archetype-resources/src/test/java:r1479141-1487694
