Ignore:
Timestamp:
Dec 10, 2010 9:03:35 AM (13 years ago)
Author:
Ted Faber <faber@…>
Branches:
axis_example, compt_changes, info-ops, master
Children:
52b6ebc
Parents:
913dc7a (diff), 8d5394e (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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • fedd/federation/server.py

    r913dc7a r66bb590  
    1313
    1414from fedid import fedid
     15
     16# ZSI uses a deprecated multifile interface.  This shuts the warning system up.
     17from warnings import filterwarnings
     18filterwarnings("ignore", ".*multifile.*", DeprecationWarning, "ZSI")
     19
    1520try:
    1621    from fedd_services import ns0
Note: See TracChangeset for help on using the changeset viewer.