Author: afuchs
Date: Tue Jun 11 13:59:27 2013
New Revision: 1491796
URL: http://svn.apache.org/r1491796
Log:
ACCUMULO-1488 backported to 1.5 branch
Added:
accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/iterators/user/BigDecimalCombiner.java
- copied unchanged from r1491792,
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/user/BigDecimalCombiner.java
accumulo/branches/1.5/core/src/test/java/org/apache/accumulo/core/iterators/user/BigDecimalCombinerTest.java
- copied unchanged from r1491792,
accumulo/trunk/core/src/test/java/org/apache/accumulo/core/iterators/user/BigDecimalCombinerTest.java
Modified:
accumulo/branches/1.5/ (props changed)
accumulo/branches/1.5/assemble/ (props changed)
accumulo/branches/1.5/core/ (props changed)
accumulo/branches/1.5/examples/ (props changed)
accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
(props changed)
accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
(props changed)
accumulo/branches/1.5/proxy/README (props changed)
accumulo/branches/1.5/server/ (props changed)
accumulo/branches/1.5/src/ (props changed)
Propchange: accumulo/branches/1.5/
------------------------------------------------------------------------------
Merged /accumulo/trunk:r1491791-1491792
Propchange: accumulo/branches/1.5/assemble/
------------------------------------------------------------------------------
Merged /accumulo/trunk/assemble:r1491791-1491792
Propchange: accumulo/branches/1.5/core/
------------------------------------------------------------------------------
Merged /accumulo/trunk/core:r1491791-1491792
Propchange: accumulo/branches/1.5/examples/
------------------------------------------------------------------------------
Merged /accumulo/trunk/examples:r1491791-1491792
Propchange:
accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
------------------------------------------------------------------------------
Merged
/accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1491791-1491792
Propchange:
accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
------------------------------------------------------------------------------
Merged
/accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java:r1491791-1491792
Propchange: accumulo/branches/1.5/proxy/README
------------------------------------------------------------------------------
Merged /accumulo/trunk/proxy/README:r1491791-1491792
Propchange: accumulo/branches/1.5/server/
------------------------------------------------------------------------------
Merged /accumulo/trunk/server:r1491791-1491792
Propchange: accumulo/branches/1.5/src/
------------------------------------------------------------------------------
Merged /accumulo/trunk/src:r1491791-1491792
