diff options
author | Seth Vidal <skvidal@fedoraproject.org> | 2007-10-08 16:19:10 -0400 |
---|---|---|
committer | Seth Vidal <skvidal@fedoraproject.org> | 2007-10-08 16:19:10 -0400 |
commit | 5ded2eccc6a6d6c574843139bac8747013326dbd (patch) | |
tree | b1918338edb3831604e834fab2642a37f12cc4dd /func/minion | |
parent | 87644d612c2061c4d8670c1cb046cc4a37a3dbb5 (diff) | |
parent | e09c2a9c1506d254299b3743d3524a5204eceed0 (diff) | |
download | func-5ded2eccc6a6d6c574843139bac8747013326dbd.tar.gz func-5ded2eccc6a6d6c574843139bac8747013326dbd.tar.xz func-5ded2eccc6a6d6c574843139bac8747013326dbd.zip |
Merge branch 'master' of ssh://git.fedoraproject.org/git/hosted/func
* 'master' of ssh://git.fedoraproject.org/git/hosted/func:
er, merge?
add a couple alternatice serializers just for kicks
sort the returns of these methods just to make it purdy
Diffstat (limited to 'func/minion')
-rwxr-xr-x | func/minion/server.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/func/minion/server.py b/func/minion/server.py index 921aa03..c900a09 100755 --- a/func/minion/server.py +++ b/func/minion/server.py @@ -81,10 +81,14 @@ class XmlRpcInterface(object): self.handlers["system.list_modules"] = self.list_modules def list_modules(self): - return self.modules.keys() + modules = self.modules.keys() + modules.sort() + return modules def list_methods(self): - return self.handlers.keys() + methods = self.handlers.keys() + methods.sort() + return methods def get_dispatch_method(self, method): |