Commit Graph

37916 Commits

Author SHA1 Message Date
Thomas S Hatch
8ed1daba67 Merge pull request #20305 from rallytime/bp-20216
Backport #20216 to 2014.7
2015-02-03 05:55:24 -07:00
Thomas S Hatch
90b5497b49 Merge pull request #20278 from kim0/freebsd-status.netdev
Implement freebsd status.netdev
2015-02-03 05:49:19 -07:00
Ahmed Kamal
cdfc9ea5c9 Import collections, not collections.defaultdict. Avoid polluting namespace 2015-02-03 10:27:23 +02:00
Mike Place
dbc5bb8b92 Merge pull request #20288 from jfindlay/fix_locale_gen
Fix locale gen
2015-02-02 14:21:42 -07:00
Steve Weber
6de9d62556 fix returning docs when some minions did not return
when using
```salt \* pkg -d```
some minions will not return and you get an ugly error:

```
[root@salt salt]# salt oat-app\* pkg -d
[ERROR   ] An un-handled exception was caught by salt's global exception handler:
TypeError: string indices must be integers, not str
Traceback (most recent call last):
  File "/usr/bin/salt", line 10, in <module>
    salt_main()
  File "/usr/lib/python2.6/site-packages/salt/scripts.py", line 343, in salt_main
    client.run()
  File "/usr/lib/python2.6/site-packages/salt/cli/salt.py", line 175, in run
    self._output_ret(ret, out)
  File "/usr/lib/python2.6/site-packages/salt/cli/salt.py", line 262, in _output_ret
    self._print_docs(ret)
  File "/usr/lib/python2.6/site-packages/salt/cli/salt.py", line 303, in _print_docs
    if ret[host][fun]:
TypeError: string indices must be integers, not str
Traceback (most recent call last):
  File "/usr/bin/salt", line 10, in <module>
    salt_main()
  File "/usr/lib/python2.6/site-packages/salt/scripts.py", line 343, in salt_main
    client.run()
  File "/usr/lib/python2.6/site-packages/salt/cli/salt.py", line 175, in run
    self._output_ret(ret, out)
  File "/usr/lib/python2.6/site-packages/salt/cli/salt.py", line 262, in _output_ret
    self._print_docs(ret)
  File "/usr/lib/python2.6/site-packages/salt/cli/salt.py", line 303, in _print_docs
    if ret[host][fun]:
TypeError: string indices must be integers, not str
```

the patch is is ugly!!! so please fix correctly.
```
            if ret[host] == 'Minion did not return. [Not connected]':
                continue
```

thanks
2015-02-02 13:51:19 -07:00
Ahmed Kamal
96dd7aa578 changing lambda to a full function to please the linter 2015-02-02 22:31:06 +02:00
rallytime
f0577fc50e Pylint fix for the 2014.7 branch 2015-02-02 22:31:05 +02:00
Nicole Thomas
72f3092395 Merge pull request #20300 from rallytime/pylint_seven
Pylint fix for the 2014.7 branch
2015-02-02 11:19:38 -07:00
rallytime
b26d7c7336 Pylint fix for the 2014.7 branch 2015-02-02 11:18:52 -07:00
Justin Findlay
8565d7e77a fix arch support for gen_locale
Locale on Arch does not use /usr/share/i18n/SUPPORTED and so the
/usr/share/i18n/locales directory must be inspected for filenames with
the codeset and charmap parts removed from the locale specification.
This partially reverts, but also fixes #20097 for @s0undt3ch.
2015-02-01 18:15:37 -07:00
Justin Findlay
17a6c62f6a add locale specifier parsing utilities 2015-02-01 18:02:41 -07:00
Ahmed Kamal
179153d201 Implement freebsd status.netdev 2015-01-31 18:35:55 +02:00
Thomas S Hatch
f84249e9e5 Merge pull request #20271 from s0undt3ch/2014.7
Don't try to import non configurable syspath variables
2015-01-31 03:20:55 -07:00
Pedro Algarvio
f1dd99c26f Don't try to import non configurable syspath variables 2015-01-31 00:35:54 +00:00
Mike Place
0e22364a83 Merge pull request #20268 from whiteinge/django-auth-traceback
Prevent Django auth traceback
2015-01-30 16:43:57 -07:00
Seth House
0370bd7bd3 Added a __virtual__ function to the Django auth module 2015-01-30 16:41:50 -07:00
Seth House
8ca6fdaba4 Moved django.contrib.auth import out of module into function
If Django is installed but DJANGO_SETTINGS_MODULE not set the loader
throws a traceback:

Traceback (most recent call last):
  File "/usr/lib/python2.7/dist-packages/salt/loader.py", line 925, in load_modules
    ), fn_, path, desc
  File "/usr/lib/python2.7/dist-packages/salt/auth/django.py", line 54, in <module>
    import django.contrib.auth
  File "/usr/lib/python2.7/dist-packages/django/contrib/auth/__init__.py", line 6, in <module>
    from django.middleware.csrf import rotate_token
  File "/usr/lib/python2.7/dist-packages/django/middleware/csrf.py", line 14, in <module>
    from django.utils.cache import patch_vary_headers
  File "/usr/lib/python2.7/dist-packages/django/utils/cache.py", line 26, in <module>
    from django.core.cache import get_cache
  File "/usr/lib/python2.7/dist-packages/django/core/cache/__init__.py", line 69, in <module>
    if DEFAULT_CACHE_ALIAS not in settings.CACHES:
  File "/usr/lib/python2.7/dist-packages/django/conf/__init__.py", line 54, in __getattr__
    self._setup(name)
  File "/usr/lib/python2.7/dist-packages/django/conf/__init__.py", line 47, in _setup
    % (desc, ENVIRONMENT_VARIABLE))
ImproperlyConfigured: Requested setting CACHES, but settings are not configured. You must either define the environment variable DJANGO_SETTINGS_MODULE or call settings.configure() before accessing settings.
2015-01-30 16:41:33 -07:00
Seth House
68b5f5cd71 Removed unused import 2015-01-30 16:39:29 -07:00
Thomas S Hatch
b37eda267f Merge pull request #20250 from Azidburn/2014.7
Fix for feature request #10258
2015-01-30 10:58:45 -07:00
Thomas S Hatch
d0a629e721 Merge pull request #20261 from thatch45/basepi-saltssh.errors.20223
Merge #20229 with fixes
2015-01-30 10:36:51 -07:00
Thomas S Hatch
a2a4722906 lint fixes 2015-01-30 10:35:50 -07:00
Thomas S Hatch
68b2773628 Merge branch 'saltssh.errors.20223' of https://github.com/basepi/salt into basepi-saltssh.errors.20223 2015-01-30 10:35:05 -07:00
Thomas S Hatch
9fafe41be0 Merge pull request #20218 from felskrone/fqdn_master_status_2014.7
improved status.master to work with fqdns
2015-01-30 10:31:08 -07:00
Thomas S Hatch
ad6cb8c976 Merge pull request #20260 from thatch45/Jiaion-2014.7
Merge #20241 with fixes
2015-01-30 10:29:12 -07:00
Thomas S Hatch
17829583de lint fixes 2015-01-30 10:27:04 -07:00
Thomas S Hatch
36283d2d65 Merge branch '2014.7' of https://github.com/Jiaion/salt into Jiaion-2014.7 2015-01-30 10:26:42 -07:00
Thomas S Hatch
5c94ea377f Merge pull request #20237 from joejulian/2014.7
Issue #20235: blockdev.format fails when succeeding
2015-01-30 10:18:06 -07:00
Thomas S Hatch
f9b01bf08e Merge pull request #20231 from whiteinge/rest_cherrypy-docs-examples
Added several examples and clarifications to the rest_cherrypy docs
2015-01-30 10:15:23 -07:00
Thomas S Hatch
bf80cf49bc Merge pull request #20225 from jfindlay/fix_svn_mod
extend a list not a tuple
2015-01-30 10:11:30 -07:00
Thomas S Hatch
ab5cf4b92c Merge pull request #20203 from basepi/archiveextract20195
[2014.7] Iterate over the shortopts if there are more than one for archive.extracted
2015-01-30 10:04:27 -07:00
Azidburn
6c9fd6d026 corrections from jenkins build 2015-01-30 14:34:15 +01:00
Marc Thomas
441e460a20 Fix for feature request #10258 2015-01-30 13:46:54 +01:00
linxiao.jz
97f863177e fix salt libs .systemd import error 2015-01-30 17:36:39 +08:00
Joe Julian
762c6228a2 Issue #20235: blockdev.format fails when succeeding
After a mkfs is issued, an immediate lsblk will show the device as
unformatted. Issuing a sync before lsblk will allow the check to
succeed.
2015-01-29 22:26:55 -08:00
Seth House
23745daa55 Replaced HTTP examples with HTTPS
Lead by example!
2015-01-29 18:36:01 -07:00
Seth House
538e80af04 Added a note about recommended CherryPy versions due to SSL errors 2015-01-29 18:32:01 -07:00
Seth House
8a74d90813 Added a better explanation of lowdata and more examples 2015-01-29 18:32:01 -07:00
Seth House
60c2959ef5 Added two authentication examples to rest_cherrypy docs 2015-01-29 18:32:00 -07:00
Colton Myers
1b13d4d8b5 Check for terminated (errored) processes in salt-ssh
Fixes #20223
2015-01-29 17:26:08 -07:00
Nicole Thomas
8598559bfd Merge pull request #20210 from rallytime/bp-20171
Backport #20171 to 2014.7
2015-01-29 16:26:57 -07:00
Justin Findlay
b40fedcc55 extend a list not a tuple
fixes #20224
2015-01-29 16:01:26 -07:00
Nicole Thomas
a72017d516 Merge pull request #20211 from rallytime/bp-20118
Backport #20118 to 2014.7
2015-01-29 15:08:16 -07:00
rallytime
132f364e10 Don't use salt.defaults.exitcodes, just use salt.exitcodes in 2014.7 2015-01-29 15:04:26 -07:00
vs
c8f734b909 improved status.master to work with fqdns 2015-01-29 21:44:52 +01:00
Nicole Thomas
4aeaec7a94 Merge pull request #20212 from saltstack/revert-20156-bp-19566
Revert "Backport #19566 to 2014.7"
2015-01-29 13:40:13 -07:00
Nicole Thomas
9fef292d3d Revert "Backport #19566 to 2014.7" 2015-01-29 13:39:58 -07:00
kitsemets
d6e70fdf9d salt.states.cmd: fixed 'unless' behaviour in case of multiple unless commands are given 2015-01-29 13:00:18 -07:00
Thayne Harbaugh
80dc5aedd7 Minor: Improve thin and shim warnings and comments. 2015-01-29 12:58:14 -07:00
Colton Myers
8f322c96c6 Iterate over the shortopts if there are more than one
Fixes #20195
2015-01-29 10:46:31 -07:00
Thomas S Hatch
eb19ccd99e Merge pull request #20174 from kim0/freebsd-status.meminfo
Implement freebsd-status.meminfo
2015-01-29 10:34:38 -07:00