Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
    • Help
    • Submit feedback
    • Contribute to GitLab
  • Sign in / Register
emulab-devel
emulab-devel
  • Project
    • Project
    • Details
    • Activity
    • Releases
    • Cycle Analytics
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
  • Issues 116
    • Issues 116
    • List
    • Board
    • Labels
    • Milestones
  • Merge Requests 4
    • Merge Requests 4
  • Wiki
    • Wiki
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Commits
  • Issue Boards
  • emulab
  • emulab-develemulab-devel
  • Merge Requests
  • !13

Open
Opened Jun 29, 2016 by Wim Van de Meerssche@wvdemeer
  • Report abuse
Report abuse

fixed edge case for AMv3 POA geni_update_users

There was a weird edge case for AMv2 PerformOperationalAction geni_update_users. Somehow, an undef was used as $key, which was passed along from call to call all the way from GeniAM::PerformOperationalAction to GeniCM::AddKeys's $keychecker sub. In that sub, the code $key ne "" caused a crash. This should now be fixed, by adding if (defined($key)) to GeniAM.pm.in

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch https://gitlab.flux.utah.edu/wvdemeer/emulab-devel.git amv3-poa-updateusers-edgecase
git checkout -b wvdemeer/emulab-devel-amv3-poa-updateusers-edgecase FETCH_HEAD

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git fetch origin
git checkout origin/master
git merge --no-ff wvdemeer/emulab-devel-amv3-poa-updateusers-edgecase

Step 4. Push the result of the merge to GitLab

git push origin master

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines.

  • Discussion 0
  • Commits 1
  • Changes 1
Assignee
No assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
0
Labels
None
Assign labels
  • View project labels
Reference: emulab/emulab-devel!13