Commit b6bae65e authored by Brian Long's avatar Brian Long
Browse files

Merge branch 'develop' into stable

parents fe95ff62 52caf9b5
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -102,7 +102,8 @@ public class AcsReconcileService implements InitializingBean, DisposableBean {
	 * 
	 * @param fromDbId A node database ID, inclusive.
	 * @param toDbId A node database ID, exclusive.
	 * @param reindexUnreconciled For nodes not found in Solr, attempt to re-index against all applicable Solr instances.
	 * @param indexUnreconciled For nodes not found in Solr, attempt to index against all applicable Solr instances.
	 * @param reindexReconciled For nodes found in Solr, attempt to re-index against all applicable Solr instances.
	 * @param callback A callback to process multiple returned values from the re-index.
	 * @param queueTimeout A timeout for how long the calling thread should wait for space on the queue.
	 * @param queueUnit The time units for the `queueTimeout`.