Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
emulab
emulab-devel
Commits
f204152e
Commit
f204152e
authored
Feb 20, 2017
by
Leigh B Stoller
Browse files
Rename GeniUser() function to avoid conflict with GeniUser package.
Probably some perl way to avoid this, but life is short.
parent
a241b8b6
Changes
2
Hide whitespace changes
Inline
Side-by-side
protogeni/lib/GeniAggregate.pm.in
View file @
f204152e
...
...
@@ -1394,7 +1394,7 @@ sub Action($$$;$)
#
if (keys(%reloads)) {
if (EmulabFeatures->FeatureEnabled("NewOsload",
GeniUtil::GeniUser(),
GeniUtil::
Get
GeniUser(),
undef, undef)) {
require libosload_new;
$osload_object = libosload_new->New();
...
...
protogeni/lib/GeniUtil.pm.in
View file @
f204152e
...
...
@@ -141,7 +141,7 @@ sub FlipToElabMan()
#
#
Lookup
the
geniuser
.
#
sub
GeniUser
()
sub
Get
GeniUser
()
{
return
User
->
Lookup
($
GENIUSER
);
}
...
...
Write
Preview
Supports
Markdown
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