Changeset 328e93f for fedd/federation/deter_impl.py

Timestamp:

Feb 1, 2013 1:25:43 PM (11 years ago)

Author:

Ted Faber <faber@…>

Branches:

master

Children:

17c6d91

Parents:

9a52a80 (diff), 06a2b49 (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:

• fedd/federation/deter_impl.py (modified) (2 diffs)

fedd/federation/deter_impl.py

@@ -8 +8 @@
 import deter_internal_access
 import benito_access
+import desktop_access
 import skeleton_access
 
@@ -89 +90 @@
                 elif self.access_type == "benito":
                     self.access = benito_access.access(config, self.auth)
+                elif self.access_type == "desktop":
+                    self.access = desktop_access.access(config, self.auth)
                 elif self.access_type == "skel":
                     self.access = skeleton_access.access(config, self.auth)