You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ec...@apache.org on 2013/02/11 16:24:50 UTC
svn commit: r1444828 - in /accumulo/branches/1.4: ./ src/ src/core/
src/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java
src/server/ src/server/src/
Author: ecn
Date: Mon Feb 11 15:24:50 2013
New Revision: 1444828
URL: http://svn.apache.org/r1444828
Log:
ACCUMULO-971 document setTime argument to importDirectory, merge to 1.4 branch
Modified:
accumulo/branches/1.4/ (props changed)
accumulo/branches/1.4/src/ (props changed)
accumulo/branches/1.4/src/core/ (props changed)
accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java
accumulo/branches/1.4/src/server/ (props changed)
accumulo/branches/1.4/src/server/src/ (props changed)
Propchange: accumulo/branches/1.4/
------------------------------------------------------------------------------
Merged /accumulo/trunk:r1444826
Propchange: accumulo/branches/1.4/src/
------------------------------------------------------------------------------
Merged /accumulo/trunk/src:r1444826
Merged /accumulo/trunk:r1444826
Propchange: accumulo/branches/1.4/src/core/
------------------------------------------------------------------------------
Merged /accumulo/trunk/src/core:r1444826
Merged /accumulo/trunk/core:r1444826
Modified: accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java?rev=1444828&r1=1444827&r2=1444828&view=diff
==============================================================================
--- accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java (original)
+++ accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java Mon Feb 11 15:24:50 2013
@@ -398,6 +398,8 @@ public interface TableOperations {
* the HDFS directory to find files for importing
* @param failureDir
* the HDFS directory to place files that failed to be imported, must exist and be empty
+ * @param setTime
+ * override the time values in the input files, and use the current time for all mutations
* @throws IOException
* when there is an error reading/writing to HDFS
* @throws AccumuloException
Propchange: accumulo/branches/1.4/src/server/
------------------------------------------------------------------------------
Merged /accumulo/trunk/src/server:r1444826
Merged /accumulo/trunk/server:r1444826
Propchange: accumulo/branches/1.4/src/server/src/
------------------------------------------------------------------------------
Merged /accumulo/trunk/server/src:r1444826
Merged /accumulo/trunk/src/server/src:r1444826