Changeset 06a2b49 for fedd

Timestamp:

Jan 21, 2013 11:05:56 PM (12 years ago)

Author:

Ted Faber <faber@…>

Branches:

master

Children:

328e93f

Parents:

5dbcc93 (diff), dcac546 (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 ​git://fedd.deterlab.net/fedd

Location:

fedd/federation

Files:

• desktop_access.py (added)
• 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)