Ignore:
Timestamp:
09/11/13 10:10:16 (12 months ago)
Author:
Ken Moore <ken@…>
Branches:
master, 9.2-release, releng/10.0, releng/10.0.1, releng/10.0.2, releng/10.0.3
Children:
9599cf7
Parents:
8516ff2 (diff), 651bd28 (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

Conflicts:

src-qt4/life-preserver/LPWatcher.cpp

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src-qt4/life-preserver/LPWatcher.cpp

    r8516ff2 r9ba89ba  
    253253void LPWatcher::checkErrorFile(){ 
    254254  return; 
     255  //Check zpool status and report any errors/processes 
    255256  if(QFile::exists(FILE_ERROR)){ 
    256257    //Read the file to determine the cause of the error 
Note: See TracChangeset for help on using the changeset viewer.