Changeset a352710

Timestamp:

Jul 25, 2012 11:50:36 AM (12 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:

• README (modified) (1 diff)
• fedd_create.py (modified) (2 diffs)

fedd/README

@@ -1 @@
-Copyright (c) 2008-2010 USC/ISI
+Copyright (c) 2008-2012 USC/ISI
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of

fedd/fedd_create.py

@@ -45 +45 @@
                 type="string", default=[],
                 help="Service description name:exporters:importers:attrs")
-        self.add_option('--active', action='append', default=[], type='string',
-                help='a testbed that prefers active protal nodes in the map')
         self.add_option("--map", dest="map", action="append",
                 type="string", default=[],
@@ -316 +314 @@
                 'testbed': t, 
                 'uri': u,
-                'active': t in opts.active,
             } for t, u in tbmap.items()
         ]