Commit f6574db8 authored by Leigh B Stoller's avatar Leigh B Stoller
Browse files

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

parents ab3f977b 3b926d6e
......@@ -38,7 +38,7 @@ sub usage() {
}
my $optlist = "t:p:e:srafFhR";
my @columns = ("n.node_id","pid","eid","rsrv_time","reserved_pid");
my @columns = ("n.node_id","n.type","pid","eid","reserved_pid");
my %opt = ();
if (! getopts($optlist, \%opt)) {
......@@ -101,6 +101,7 @@ my $sortclause = "order by priority";
if ($opt{s}) {
$sortclause = "order by pid,eid,priority";
} elsif ($opt{r}) {
push @columns, "rsrv_time";
$sortclause = "order by rsrv_time,priority";
}
......
Supports Markdown
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