Commit 3d45940e authored by Jonathon Duerig's avatar Jonathon Duerig
Browse files

Merge branch 'master' of git-public.flux.utah.edu:/flux/git/emulab-devel

parents 6223c579 0e73ba5c
......@@ -1713,7 +1713,8 @@ sub SliverWorkAux($$$$$$$)
# Unincorporated nodes have no genisliver_idx.
my $restable = $node->ReservedTableEntry();
if (defined($restable) &&
!defined($restable->{'genisliver_idx'})) {
(!defined($restable->{'genisliver_idx'}) ||
$restable->{'genisliver_idx'} == 0)) {
$newnodes{$node->node_id()} = $node;
next;
}
......
#!/usr/bin/perl -wT
#
# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2009 University of Utah and the Flux Group.
# Copyright (c) 2008-2010 University of Utah and the Flux Group.
# All rights reserved.
#
package GeniTicket;
......@@ -826,7 +826,8 @@ sub Release($$)
if ($reservation->SameExperiment($experiment)) {
my $restable = $node->ReservedTableEntry();
if (defined($restable) &&
!defined($restable->{'genisliver_idx'})) {
(!defined($restable->{'genisliver_idx'}) ||
$restable->{'genisliver_idx'} == 0)) {
push(@nodeids, $node->node_id());
push(@nodes, $node);
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment