Merge branch 'b4'

Conflicts:
	HISTORY
	configure.ac
This commit is contained in:
Andrea Mazzoleni 2013-10-09 22:35:50 +02:00
commit bd8f592a1a
2 changed files with 7 additions and 2 deletions

View file

@ -26,6 +26,11 @@ SnapRAID HISTORY
* Faster parity computation for ARM 64 bit CPU.
* Reduced memory usage avoiding to allocate unnecessary memory.
4.3 2013/10 (BETA)
==================
* Fixed the scrub command with the -p0 option. Now it really scrubs
only the blocks marked as bad and not the full array.
4.2 2013/10
===========
* Fixed the wrong warning about physical offsets not supported caused

View file

@ -512,8 +512,8 @@ int state_scrub(struct snapraid_state* state, int percentage, int olderthan)
timelimit = recentlimit;
}
} else {
/* we don't have a time limit based on quota */
timelimit = recentlimit;
/* if we select a 0 percentage, disable also the time limit */
timelimit = 0;
}
/* free the temp vector */