git commit: [emulab-devel] branch master updated (503696e)

[Leigh B. Stoller]

Branch master has been updated: c30528f..503696e

- fixed AMv3 sliver status being geni_ready wrongfully in some cases
- Merge branch 'master-gitlab' into amv3-sliver-status-bugfix
- minor cleanup
- Merge branch 'wvdemeer/emulab-devel-amv3-sliver-status-bugfix' This m

========================================================================

commit 034e4efca173e58ca25d46a9a5e64f9f7bbe803f
Author: Wim Van de Meerssche <wim.vande...@intec.ugent.be>
Date: Tue Jan 26 15:49:20 2016 +0100

fixed AMv3 sliver status being geni_ready wrongfully in some cases

11 1 protogeni/lib/GeniAM.pm.in
1 files changed, 11 insertions(+), 1 deletions(-)

http://git-public.flux.utah.edu/?p=emulab-devel.git;a=commitdiff;h=034e4ef

------------------------------------------------------------------------

commit b0cc9cafa83e1fb43a8bc55d3ee4725031828fa0
Author: Wim Van de Meerssche <wim.vande...@intec.ugent.be>
Date: Mon Apr 11 13:51:02 2016 +0200

minor cleanup

5 5 protogeni/lib/GeniAM.pm.in
1 files changed, 5 insertions(+), 5 deletions(-)

http://git-public.flux.utah.edu/?p=emulab-devel.git;a=commitdiff;h=b0cc9ca

------------------------------------------------------------------------

commit 503696e85fcab1335cfa4586fa8809522584d23c
Merge: c30528f b0cc9ca
Author: Leigh B Stoller <sto...@flux.utah.edu>
Date: Tue Apr 12 08:12:02 2016 -0600

Merge branch 'wvdemeer/emulab-devel-amv3-sliver-status-bugfix'
This merges !5 ...

11 1 protogeni/lib/GeniAM.pm.in

http://git-public.flux.utah.edu/?p=emulab-devel.git;a=commitdiff;h=503696e

========================================================================

Clone via ssh: git-public.flux.utah.edu:/flux/git/emulab-devel.git
Clone read-only: git://git-public.flux.utah.edu/emulab-devel.git