Merge pull request #2404 from jcollie/develop

fix typo
2024-11-08 17:33:54 +00:00 · 2012-10-31 11:13:35 -07:00 · 2012-10-31 11:13:35 -07:00 · 638a450d97
commit 638a450d97
parent c57a9551a0 d63b083528
1 changed files with 1 additions and 1 deletions
--- a/salt/master.py
+++ b/salt/master.py
@ -1065,7 +1065,7 @@ class AESFuncs(object):
        try:
            ret = getattr(self, func)(load)
        except AttributeError as exc:
-            log.error(('Received function {0} which in unavailable on the '
+            log.error(('Received function {0} which is unavailable on the '
                       'master, returning False').format(exc))
            return self.crypticle.dumps(False)
        # Don't encrypt the return value for the _return func