Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emulab
emulab-devel
Commits
428d54d3
Commit
428d54d3
authored
May 30, 2018
by
Leigh B Stoller
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Minor fixes to previous revision(s).
parent
32569e18
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
db/Reservation.pm.in
db/Reservation.pm.in
+2
-1
protogeni/lib/GeniCluster.pm.in
protogeni/lib/GeniCluster.pm.in
+1
-1
No files found.
db/Reservation.pm.in
View file @
428d54d3
...
...
@@ -1251,7 +1251,7 @@ sub HistoricalReservations($$$;$) {
}
my
$
query_result
=
DBQueryFatal
(
"select *,UNIX_TIMESTAMP(start) AS s, "
.
" UNIX_TIMESTAMP(end)
,
AS e "
.
" UNIX_TIMESTAMP(end) AS e
,
"
.
" UNIX_TIMESTAMP(created) AS c, "
.
" UNIX_TIMESTAMP(canceled) AS d, "
.
" UNIX_TIMESTAMP(deleted) AS k "
.
...
...
@@ -1283,6 +1283,7 @@ sub HistoricalReservations($$$;$) {
}
return
@
answer
;
}
sub
deleted
($)
{
return
$
_
[
0
]->{
"DELETED"
};
}
sub
ExptTypes
($)
{
my
($
exptidx
)
=
@
_
;
...
...
protogeni/lib/GeniCluster.pm.in
View file @
428d54d3
...
...
@@ -1713,7 +1713,7 @@ sub ReservationHistory($)
$
blob
->{
"nodes"
}
=
$
res
->
nodes
();
$
blob
->{
"type"
}
=
$
res
->
type
();
$
blob
->{
"created"
}
=
TBDateStringGMT
($
res
->
created
());
$
blob
->{
"canceled"
}
=
TBDateStringGMT
($
res
->
cancel
ed
());
$
blob
->{
"canceled"
}
=
TBDateStringGMT
($
res
->
cancel
());
$
blob
->{
"deleted"
}
=
TBDateStringGMT
($
res
->
deleted
());
$
blob
->{
"start"
}
=
TBDateStringGMT
($
res
->
start
());
$
blob
->{
"end"
}
=
TBDateStringGMT
($
res
->
end
());
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment