valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
44,615 Commits 24 Branches 182 Tags 341 MiB
b7ae48642a
Commit Graph

44615 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Aurynn Shaw
b7ae48642a Adds fire_master to the Salt Event library, for use in 3rd-party code. 2015-01-13 09:29:27 +13:00
Thomas S Hatch
8d45f147bf Merge pull request #19633 from ether42/develop 
lxc module: kwarg shadowing in run_cmd provokes unexpected return value
 2015-01-12 12:04:54 -07:00
Thomas S Hatch
b7899b2935 Merge pull request #19058 from cournape/add_darwin_pkg_support 
Add darwin pkg support
 2015-01-12 11:43:44 -07:00
Thomas S Hatch
2c065ac5b9 Merge pull request #19640 from TronPaul/s3_source_hash 
Add s3 to protocols for remote source_hash
 2015-01-12 11:38:01 -07:00
Thomas S Hatch
41eb958dbf Merge branch 'aurynn-develop' into develop 2015-01-12 11:36:38 -07:00
Thomas S Hatch
bc74de81c6 Merge branch 'develop' of https://github.com/aurynn/salt into aurynn-develop 
Conflicts:
	doc/topics/ssh/roster.rst
 2015-01-12 11:36:24 -07:00
Thomas S Hatch
c79871e77d Merge pull request #19637 from s0undt3ch/develop 
Merge branch '2015.2' into develop
 2015-01-12 11:33:14 -07:00
Thomas S Hatch
f7f564e1b1 Merge pull request #19634 from DSRCompany/raet_presence_requests 
Slightly refactored Salt Raet Presenter code
 2015-01-12 11:32:08 -07:00
Thomas S Hatch
7406b778f1 Merge pull request #19253 from jacksontj/runner_event 
Refactor of evented runners (#17283)
 2015-01-12 10:51:16 -07:00
Pedro Algarvio
eeb6dadc21 Merge branch '2015.2' into develop 2015-01-12 17:13:57 +00:00
Pedro Algarvio
229fa20808 Merge branch 'develop' of github.com:saltstack/salt into develop 2015-01-12 17:13:49 +00:00
Pedro Algarvio
0ceda58bd6 Fix mock call. 2015-01-12 16:51:02 +00:00
Thomas S Hatch
2fe1757cb9 Merge pull request #19599 from fayetted/Issue_19598 
Fix ssh_auth test mode, compare lines not just key
 2015-01-12 09:13:23 -07:00
Thomas S Hatch
86a3bf3269 Merge pull request #19429 from lyft/ignore-missing-for-pillars 
Add new ignore_missing option to pillar top
 2015-01-12 09:06:15 -07:00
Pedro Algarvio
9e121e3317 Fix brew unit tests 2015-01-12 02:30:38 +00:00
Mark McGuire
af4aee8a6b Add s3 to protocols for remote source_hash 2015-01-11 19:11:35 -06:00
Aurynn Shaw
e1dbd4c07e Removes spurious text 2015-01-12 13:55:44 +13:00
Aurynn Shaw
7e4f5639ec Updates Salt SSH roster documentation, adding thin_dir and a note on setting persistent grains 2015-01-12 13:54:30 +13:00
Pedro Algarvio
209c0f35c4 Fix stripped kwarg from the merge forward 2015-01-12 00:38:55 +00:00
Pedro Algarvio
c3bc043b23 Merge branch '2015.2' into develop 
Conflicts:
	salt/syspaths.py
	setup.py
	tests/integration/__init__.py
 2015-01-11 22:45:35 +00:00
Pedro Algarvio
9d0fe5b1d1 Merge branch '2014.7' into 2015.2 
Conflicts:
	salt/modules/brew.py
	tests/integration/__init__.py
 2015-01-11 22:40:16 +00:00
Daniel Fayette
1fee1ad67b Fix ssh_auth test mode, compare lines not just key 
Intened to fix #19598
 2015-01-11 15:09:22 -06:00
Thomas S Hatch
b85999988b Merge pull request #19621 from stackstrap/develop 
Adding Hjson renderer.
 2015-01-11 10:12:24 -07:00
Thomas S Hatch
fc06a8bbc8 Merge pull request #19571 from s0undt3ch/hotfix/setup-salt-paths 
Fix setup salt paths
 2015-01-11 09:46:48 -07:00
Pedro Algarvio
014e1cd888 Merge pull request #19602 from rallytime/bp-19585 
Backport #19585 to 2014.7
 2015-01-11 15:38:58 +00:00
Dmitry Kuzmenko
e5b8fa2b11 Slightly refactored Salt Raet Presenter code 2015-01-11 17:41:35 +03:00
Kevin "ether" Boulain
95b508abca lxc module: kwarg shadowing provokes unexpected return value 2015-01-11 14:09:03 +01:00
Thomas Jackson
d29f175ce5 Add missing import 2015-01-10 16:48:35 -08:00
Thomas Jackson
c5b86e21cc Fix typo 2015-01-10 16:48:35 -08:00
Thomas Jackson
4ad53c7438 Workaround for race condition in SaltEvent() creation and the zmq socket actually connecting 2015-01-10 16:48:35 -08:00
Thomas Jackson
a1dc11ff2b Cleanup, we don't always need an "event" object, so lets not always create one 2015-01-10 16:48:35 -08:00
Thomas Jackson
add997f62c For some reason having the event init in the shared subclass causes problems. 2015-01-10 16:48:35 -08:00
Thomas Jackson
9c7d15792d Revert function calls 
Apparently the wheel API varies quite a bit from the runner API, we'll have to clean that up in the future
 2015-01-10 16:32:25 -08:00
Thomas Jackson
7abf26ed59 Don't spin waiting for runner return, just use get_event (it has a poller) 
Conflicts:
	salt/runner.py
 2015-01-10 16:32:25 -08:00
Thomas Jackson
eff95e8b1d Add a blacklist of suffixes for the client mixin to print out 2015-01-10 16:32:25 -08:00
Thomas Jackson
d71f40733b Pylint and style cleanup 2015-01-10 16:32:25 -08:00
Thomas Jackson
3885773800 Re-add call_func backwards compat func 2015-01-10 16:32:24 -08:00
Thomas Jackson
223f3a0079 Add a return to the async method (jid) 2015-01-10 16:32:24 -08:00
Thomas Jackson
e320c94d1c Fix runner returns 2015-01-10 16:32:24 -08:00
Thomas Jackson
e35c7ac313 cleanup "Caste jid as str (its an int all over), and change runner tag to correct prefix" 
This reverts most of commit 745f2d84835ae23800358cd4dcc9c8525b502714.

apparently I picked up some other changes I didn't mean to

Conflicts:
	salt/utils/event.py
	tests/integration/utils/test_reactor.py
 2015-01-10 16:32:24 -08:00
Thomas Jackson
80f764cc58 Remove PID since the process is daemonized afterwards, meaning that pid isn't correct 2015-01-10 16:32:24 -08:00
Thomas Jackson
38be13b924 Clean up comments 2015-01-10 16:31:59 -08:00
Thomas Jackson
45ae85a8c5 Backwards compatibility with args as well. 
With format_call you can pass in positional args as kwargs with the key being the name of the variable in the function call.
 2015-01-10 16:31:59 -08:00
Thomas Jackson
496eb263c4 Add backwards compatibility to "low" function-- since the object isn't well documented we have apparently used it in all possible ways ;) 2015-01-10 16:31:59 -08:00
Thomas Jackson
06fd7b3238 Style cleanup 2015-01-10 16:31:59 -08:00
Thomas Jackson
169e3df26e Fix typo 2015-01-10 16:31:59 -08:00
Thomas Jackson
d352057f11 Pylint fix 2015-01-10 16:31:59 -08:00
Thomas Jackson
1e1107272a Remove __progress__ from lint checks, and add in jid_event 2015-01-10 16:31:59 -08:00
Thomas Jackson
a2fcfc2dd7 Change to new event fire_event markup 2015-01-10 16:31:59 -08:00
Thomas Jackson
c2c1457bcc Change how we print out events from runner/wheel calls 
Now if you do something like:
```
fire_event({'data': 'Runner is {0}% done'.format(i), 'outputter': 'pprint'}, 'progress')
'Runner is 96% done'
```

```
fire_event({'data': 'Runner is {0}% done'.format(i)}, 'progress')
progress: {'data': 'Runner is 12% done'}
```

This means that you don't have to actually specify the outputters etc if you just want it to print something.
 2015-01-10 16:31:59 -08:00