Changeset a352710 for fedd


Ignore:
Timestamp:
Jul 25, 2012 11:50:36 AM (7 years ago)
Author:
Ted Faber <faber@…>
Branches:
compt_changes, master
Children:
eac54fa
Parents:
5e0b7dc (diff), e5a595e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' of tardis.deterlab.net:/var/local/git/fedd

Location:
fedd
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • fedd/README

    ra452f3c re5a595e  
    1 Copyright (c) 2008-2010 USC/ISI
     1Copyright (c) 2008-2012 USC/ISI
    22
    33Permission is hereby granted, free of charge, to any person obtaining a copy of
  • fedd/fedd_create.py

    r7ec0dc2 r5e0b7dc  
    4545                type="string", default=[],
    4646                help="Service description name:exporters:importers:attrs")
    47         self.add_option('--active', action='append', default=[], type='string',
    48                 help='a testbed that prefers active protal nodes in the map')
    4947        self.add_option("--map", dest="map", action="append",
    5048                type="string", default=[],
     
    316314                'testbed': t,
    317315                'uri': u,
    318                 'active': t in opts.active,
    319316            } for t, u in tbmap.items()
    320317        ]
Note: See TracChangeset for help on using the changeset viewer.