All new accounts created on Gitlab now require administrator approval. If you invite any collaborators, please let Flux staff know so they can approve the accounts.

Commit c161fc3a authored by Leigh B Stoller's avatar Leigh B Stoller

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

parents d4d0add2 b4c6d4a2
#!/usr/bin/perl -wT
#!/usr/bin/perl -w
#
# EMULAB-COPYRIGHT
# Copyright (c) 2000-2008 University of Utah and the Flux Group.
# Copyright (c) 2000-2010 University of Utah and the Flux Group.
# All rights reserved.
#
use English;
......@@ -200,12 +200,14 @@ if ($today == 7) {
if (! ($query_result =
DBQueryWarn("select n.node_id from nodes as n ".
"left join node_types as t on t.type=n.type ".
"left join reserved as r on r.node_id=n.node_id ".
"where (n.eventstate!='". TBDB_NODESTATE_ISUP ."' and ".
" n.eventstate!='". TBDB_NODESTATE_PXEWAIT ."' and ".
" n.eventstate!='". TBDB_NODESTATE_ALWAYSUP ."' and ".
" n.eventstate!='". TBDB_NODESTATE_POWEROFF ."') ".
" and r.pid is null and n.role='testnode'"))) {
" and r.pid is null and n.role='testnode' and ".
" t.isfednode=0"))) {
fatal("Error accessing the database.");
}
......
......@@ -1132,7 +1132,7 @@ sub handleCommand($$;$$) {
# so we don't need to do any fancy stuff here.
my $cmd = "$power $func $nodelist &";
debug("$cmd\n") and
debug("$cmd\n");
system($cmd) and
notify("$params/$command: ".
"Command '$cmd' failed, error $?: $!\n");
......
......@@ -344,7 +344,6 @@ sub Version($)
else {
$self->{'version'} = $response->value()->{'api'};
$self->{'apilevel'} = $response->value()->{'level'};
$self->{'apilevel'} = 0;
$self->{'api'} = "CM";
}
}
......
......@@ -169,7 +169,7 @@ sub Create($$$$)
# For now, all tickets expire very quickly ...
#
$self->{'redeem_before'} =
POSIX::strftime("20%y-%m-%dT%H:%M:%S", localtime(time() + (5*60)));
POSIX::strftime("20%y-%m-%dT%H:%M:%S", localtime(time() + (10*60)));
#
# Locally generated tickets need a local DB index, which can be the
......
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