arif/xcat-core
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

defect 4153: resolve the merge conflict which introduced by commit 899cb5028d

Browse Source
This commit is contained in:
daniceexi 2014-06-04 08:44:40 -04:00
parent d5e6982054
commit 4f3bf457a6
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
xCAT-server/lib/xcat/plugins/yaboot.pm
View File

@ -725,14 +725,8 @@ sub process_request {
if ($errored) {
my $rsp;
$rsp->{errorcode}->[0]=1;
<<<<<<< HEAD
$rsp->{error}->[0]="Failed in running end prescripts\n";
$::YABOOT_callback->($rsp);
return;
=======
$rsp->{error}->[0]="Failed in running end prescripts. Processing will still continue.\n";
$callback->($rsp);
>>>>>>> 78b8d21... defect 4147 - allow nodeset to continue if prescript errors
$::YABOOT_callback->($rsp);
}
}
}