Ignore:
Timestamp:
02/25/14 11:37:34 (10 months ago)
Author:
Ken Moore <ken@…>
Branches:
master, releng/10.0.1, releng/10.0.2, releng/10.0.3, releng/10.1
Children:
32be23f
Parents:
9cbf5aa (diff), 9cd0fa0 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' of github.com:pcbsd/pcbsd

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src-sh/lpreserver/backend/zfslistcron.sh

    r2b45e58 r9cd0fa0  
    2525   if [ "$min" = '*/10' ] ; then time="10min" ; fi 
    2626   if [ "$min" = '*/5' ] ; then time="5min" ; fi 
     27   if [ "$min" = '*/5' -a "$count" = "auto" ] ; then time="Automatic" ; fi 
    2728   echo "$i - $time - total: $count" 
    2829done 
Note: See TracChangeset for help on using the changeset viewer.