valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
42,020 Commits 24 Branches 182 Tags 341 MiB
e64398dbe2
Commit Graph

42020 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nitin Madhok
edacf838ab Replaced import six in file /salt/search/whoosh_search.py 2014-11-18 21:20:25 +00:00
Nitin Madhok
a70d63314d Replaced import six in file /salt/search/__init__.py 2014-11-18 21:20:25 +00:00
Nitin Madhok
af79c106c2 Replaced import six in file /salt/cli/__init__.py 2014-11-18 21:20:24 +00:00
Nitin Madhok
4d5b9af6b4 Replaced import six in file /salt/daemons/flo/core.py 2014-11-18 21:20:24 +00:00
Nitin Madhok
d8d26b30f4 Replaced import six in file /salt/daemons/__init__.py 2014-11-18 21:20:24 +00:00
Nitin Madhok
c0a46301b9 Replaced import six in file /salt/fileserver/s3fs.py 2014-11-18 21:20:24 +00:00
Nitin Madhok
715ff55217 Replaced import six in file /salt/fileserver/roots.py 2014-11-18 21:20:24 +00:00
Nitin Madhok
718ed44836 Replaced import six in file /salt/fileserver/__init__.py 2014-11-18 21:20:24 +00:00
Nitin Madhok
7107160455 Replaced import six in file /salt/output/highstate.py 2014-11-18 21:20:24 +00:00
Nitin Madhok
7ee2617f44 Replaced import six in file /salt/output/grains.py 2014-11-18 21:20:24 +00:00
Nitin Madhok
89c39c27c9 Replaced import six in file /salt/output/__init__.py 2014-11-18 21:20:24 +00:00
Nitin Madhok
1770e8978f Replaced import six in file /salt/client/__init__.py 2014-11-18 21:20:24 +00:00
Nitin Madhok
1b7d8f09e5 Replaced import six in file /salt/runners/test.py 2014-11-18 21:20:23 +00:00
Nitin Madhok
50f4ab521f Replaced import six in file /salt/runners/manage.py 2014-11-18 21:20:23 +00:00
Nitin Madhok
6fdcbf57bc Replaced import six in file /salt/runners/lxc.py 2014-11-18 21:20:23 +00:00
Nitin Madhok
91f8b9e2d8 Replaced import six in file /salt/runners/doc.py 2014-11-18 21:20:23 +00:00
Nitin Madhok
5b2188e1ac Replaced import six in file /salt/netapi/rest_tornado/event_processor.py 2014-11-18 21:17:26 +00:00
Nitin Madhok
37becbddcb Replaced import six in file /salt/netapi/rest_cherrypy/event_processor.py 2014-11-18 21:17:26 +00:00
Thomas S Hatch
ddc0242eec Merge pull request #18223 from basepi/merge-forward 
Merge forward from 2014.7 to develop
 2014-11-18 13:31:20 -07:00
Colton Myers
716a7e3331 Merge branch '2014.7' into merge-forward 
Conflicts:
	salt/modules/bsd_shadow.py
	salt/modules/freebsdjail.py
	salt/modules/yumpkg.py
	salt/modules/zfs.py
	salt/modules/zypper.py
	salt/netapi/rest_tornado/saltnado.py
	salt/states/dockerio.py
 2014-11-18 12:46:29 -07:00
Thomas S Hatch
17e6bfefc8 Merge pull request #18210 from jacksontj/2014.7 
2014.7
 2014-11-18 11:04:48 -07:00
Pedro Algarvio
48b1230a04 Merge pull request #18211 from techhat/httpstate 
Account for possibly missing data structures
 2014-11-18 18:00:30 +00:00
Thomas S Hatch
9636faeb5c Merge pull request #18212 from cachedout/issue_18182 
Fix typo
 2014-11-18 10:49:38 -07:00
Thomas S Hatch
38bd744a53 Merge pull request #18207 from thatch45/kostko-pyobjects-salt-call 
Merge #18196 with fixes
 2014-11-18 10:10:32 -07:00
Mike Place
a8162f64ad Fix typo 2014-11-18 09:56:18 -07:00
Joseph Hall
8ac080e791 Account for possibly missing data structures 2014-11-18 09:53:20 -07:00
Thomas Jackson
aa1faeba78 Merge branch '2014.7' of github.com:jacksontj/salt into 2014.7 2014-11-18 08:51:08 -08:00
Samuel Smith
02fc2d091d Merge pull request #18208 from SmithSamuelM/sam_call2 
Fix some bugs. Better support for new async salt-run. preliminary support for syndic
 2014-11-18 09:34:59 -07:00
Thomas S Hatch
2ca4c9f954 Merge pull request #18204 from whiteinge/doc-state.event-sh-ex 
Add a few improvements and fixes to the state.event shell script example
 2014-11-18 09:34:41 -07:00
Thomas S Hatch
5993011a0a Merge pull request #18205 from eliasp/2014.7-.gitignore-add-lib64 
Add 'lib64' to .gitignore which might be created by 'virtualenv'.
 2014-11-18 09:34:13 -07:00
Thomas S Hatch
27c9c52dc2 Merge pull request #18202 from rominf/virtualbox 
vbox_guest module: not upgrade OS by default (can be unexpected)
 2014-11-18 09:28:44 -07:00
Thomas S Hatch
01fcd88160 Merge pull request #18200 from ianare/systemd_grains 
add systemd info in grains
 2014-11-18 09:28:14 -07:00
Thomas S Hatch
12fcadd0d1 Merge pull request #18197 from nmadhok/doc-fixes 
Fixing sphinx violations and errors
 2014-11-18 09:25:26 -07:00
Thomas S Hatch
6a987f2345 lint fixes 2014-11-18 09:23:25 -07:00
Samuel M Smith
efea829443 Merge remote-tracking branch 'upstream/develop' into sam_call2 2014-11-18 09:21:07 -07:00
Thomas S Hatch
b13c5ceee1 Merge branch 'pyobjects-salt-call' of https://github.com/kostko/salt into kostko-pyobjects-salt-call 2014-11-18 09:21:02 -07:00
Samuel M Smith
4b204727fb revert inhibiition of return since it breaks salt-run which is expecting the return. 
restore after fixing salt-run
 2014-11-18 09:15:09 -07:00
Samuel M Smith
bf3b20a787 Stop calling destroy on __del__ as there is a race condition where modules are unloaded 
so the close of the stack.server will fail with exception.
Need to call destroy manually when done using the stack
 2014-11-18 09:13:44 -07:00
Thomas Jackson
8c06556215 De-dupe imports 2014-11-18 08:13:16 -08:00
Thomas S Hatch
ae6c6a0dbe Merge pull request #18195 from thatch45/ext_dir 
remove the ext dir, we don't use it
 2014-11-18 09:13:09 -07:00
Samuel M Smith
75ed32e3d9 Fix exception when missing name of module to load 2014-11-18 09:12:11 -07:00
Thomas S Hatch
c2471283e6 Merge pull request #18206 from saltstack/revert-17284-develop 
Revert "Read Pillar files into OrderedDict to preserve source order"
 2014-11-18 09:11:34 -07:00
Thomas S Hatch
e07cd2134b Revert "Read Pillar files into OrderedDict to preserve source order" 2014-11-18 09:11:27 -07:00
Elias Probst
a39dfb98a2 Add 'lib64' to .gitignore which might be created by 'virtualenv'. 
On 64bit systems, 'lib64' might be created as a symlink to './lib'.
 2014-11-18 17:05:15 +01:00
Thomas Jackson
fbc48e6d9d Move exception over to format_call 
This means we can catch typos in formatting and not let the reactor process die. Previously it would die with something like:
```
Process Reactor-6:
Traceback (most recent call last):
  File "/usr/lib64/python2.7/multiprocessing/process.py", line 258, in _bootstrap
    self.run()
  File "/home/jacksontj/src/salt/salt/utils/event.py", line 686, in run
    self.call_reactions(chunks)
  File "/home/jacksontj/src/salt/salt/utils/event.py", line 672, in call_reactions
    self.wrap.run(chunk)
  File "/home/jacksontj/src/salt/salt/utils/event.py", line 707, in run
    f_call = salt.utils.format_call(l_fun, low)
  File "/home/jacksontj/src/salt/salt/utils/__init__.py", line 861, in format_call
    used_args_count
SaltInvocationError: run takes at least 1 argument (0 given)
```

Now you'll just get an error logged which looks something like:

```
[ERROR   ] Failed to execute run: <bound method ReactWrap.run of <salt.utils.event.ReactWrap object at 0x1f6f850>>
Traceback (most recent call last):
  File "/home/jacksontj/src/salt/salt/utils/event.py", line 708, in run
    f_call = salt.utils.format_call(l_fun, low)
  File "/home/jacksontj/src/salt/salt/utils/__init__.py", line 861, in format_call
    used_args_count
SaltInvocationError: run takes at least 1 argument (0 given)
```
 2014-11-18 07:54:48 -08:00
Seth House
69448ef3d8 Add a few improvements and fixes to the state.event shell script example 2014-11-18 09:50:11 -06:00
Roman Inflianskas
382896f98f vbox_guest module: not upgrade OS by default (can be unexpected) 2014-11-18 17:40:36 +03:00
Ianaré Sévi
3bcc8d4d08 fix pylint 2014-11-18 13:16:26 +01:00
Ianaré Sévi
6000656c1c add systemd info in grains 2014-11-18 11:38:16 +01:00
Nitin Madhok
3306ac2e21 Including doc in toctree 2014-11-18 03:26:54 -05:00