Merge branch 'master' of ssh://git.code.sf.net/p/xcat/xcat-core

xCAT-client/bin/xcoll

@@ -10,8 +10,10 @@ my %output;
 
 my $option;
 my $printcount;
+my $individual;
 
 GetOptions("n"=>\$option,
+           "i"=>\$individual,
            "c"=>\$printcount);
 
 while (<STDIN>) {
@@ -27,8 +29,10 @@ while (<STDIN>) {
     $output{$node}.=$output;
 }
 my %collated;
-foreach (keys %output) {
-    $collated{$output{$_}}->{$_}=1;
+unless ($individual) {
+    foreach (keys %output) {
+        $collated{$output{$_}}->{$_}=1;
+    }
 }
 
 my $nodes;
@@ -38,6 +42,16 @@ sub fillerup {
         $nodes = $response->{data}->[0];
     }
 }
+if ($individual) {
+    foreach my $node (keys %output) {
+        print "====================================\n";
+        print "$node\n";
+        print "====================================\n";
+        print $output{$node};
+        print "\n";
+    }
+    exit(0);
+}
 foreach my $output (keys %collated) {
     $nodes = join(',',sort (keys %{$collated{$output}}));
     my $cmdref = {

xCAT-server/lib/xcat/plugins/blade.pm

@@ -450,7 +450,7 @@ sub eventlog { #Tried various optimizations, but MM seems not to do bulk-request
       } else {
           foreach (@moreslots) {
             #$matchstring=sprintf("BLADE_%02d",$_);
-            $matchstring=sprintf("(NODE_%02d|BLADE_%02d",$_,$_);
+            $matchstring=sprintf("(NODE_%02d|BLADE_%02d)",$_,$_);
             if ($source =~ m/$matchstring$/i) { #MM guys changed their minds on capitalization
                 if (defined($order)) {
                     $numentries++;