valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-09 01:36:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
41,626 Commits 24 Branches 182 Tags 341 MiB
9d7517c791
Commit Graph

41626 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
8c88cdde7f Initial sketch of django returner 2014-11-13 14:41:06 -07:00
Tehmasp Chaudhri
cd7d739b02 Typo fix and formatting 2014-11-13 13:59:23 -07:00
Mathieu Le Marec - Pasquet
57cfe20657 Fix progress/jid injection & rename progress to __progress__ 
This refs #17701, #17725, #17335.
 2014-11-13 21:48:02 +01:00
Mathieu Le Marec - Pasquet
e01c0f9224 Other improvments for runner in synchoneous mode 2014-11-13 21:47:25 +01:00
Mathieu Le Marec - Pasquet
36c449b453 do not use multiprocessing in runner/sync mode. 
This refs #17701.
 2014-11-13 21:47:25 +01:00
rallytime
d86808c184 Fix "no example" test failures 2014-11-13 13:02:33 -07:00
Colton Myers
9a89057f83 Merge branch '2014.7' into merge-forward 
Conflicts:
	salt/transport/__init__.py
 2014-11-13 12:40:24 -07:00
Thomas Jackson
1454e8a514 An additional fix for #17080 2014-11-13 11:34:18 -08:00
Colton Myers
21bf2ef724 Merge pull request #18061 from terminalmage/sync_all-docstring 
Add explanation of "refresh" arg to saltutil.sync_all
 2014-11-13 12:29:22 -07:00
Erik Johnson
6a7570c8d6 Add explanation of "refresh" arg to saltutil.sync_all 2014-11-13 13:18:47 -06:00
Nicole Thomas
886ea165c9 Merge pull request #18046 from s0undt3ch/issues/17760 
Instantiate a logger in order to log.
 2014-11-13 09:57:42 -07:00
rallytime
313f5f8a3b Added some more pylint disables to six changes 2014-11-13 09:38:29 -07:00
Nicole Thomas
d54fbe8887 Merge pull request #17866 from jfindlay/netapi_known_jid_test 
integration test: known JID through netapi #15763
 2014-11-13 09:17:45 -07:00
Adrien "ze" Urban
41c7c9babc fix: (netbsd)sysctl.persist (state was broken) 
states/sysctl calls sysctl.persist with config file, regardless of the
OS. *_sysctl do have that parameter, but netbsd_sysctl.

Now, netbsd_sysctl takes a config file with a default value like the
others.
 2014-11-13 13:13:52 +01:00
Adrien "ze" Urban
bd550b9a79 fix: netbsd_sysctl.persist with new key 
When the key was not already present in sysctl.conf, the creatin was
still trying to access the (un)matched line groups.
 2014-11-13 13:13:51 +01:00
Joseph Hall
b4db5ded87 Merge pull request #18041 from garethgreenaway/iptables_aggregate 
Additions to iptables state module
 2014-11-12 22:39:35 -07:00
Erik Johnson
5ea814d670 Merge pull request #17954 from bersace/detect-simple-chroot 
Detect chroot virtualization subtype
 2014-11-12 20:03:20 -06:00
Pedro Algarvio
d5b700a510 Merge pull request #17940 from cvrebert/patch-1 
ipaddr: remove now-redundant&unnecessary import
 2014-11-13 01:57:01 +00:00
Pedro Algarvio
600c4d5cd8 Merge pull request #17968 from basepi/issue_17687 
Only read first line of minion_id
 2014-11-13 01:55:41 +00:00
Pedro Algarvio
852f47ea19 Remove deprecated and ignored PyLint options 2014-11-13 01:49:43 +00:00
Pedro Algarvio
3545e39907 Instantiate a logger in order to log. 
Fixes #17762.
 2014-11-13 01:49:37 +00:00
Justin Findlay
9158661205 expand unittest docs: formal style, more examples 2014-11-12 16:55:50 -07:00
Samuel Smith
d3af1d57e4 Merge pull request #18042 from SmithSamuelM/sam_call1 
Fixed race conditions with salt-call using Raet when no local minion
 2014-11-12 16:32:09 -07:00
Samuel M Smith
f346317023 Merge remote-tracking branch 'upstream/develop' into sam_call1 2014-11-12 16:11:00 -07:00
Samuel M Smith
666bca2803 fix lint errors 2014-11-12 16:09:51 -07:00
Justin Findlay
217217f624 wrap unittest doc at 80 chars 2014-11-12 15:59:35 -07:00
Gareth J. Greenaway
41478ddbfc Initially adding aggregation support to the iptables state. 2014-11-12 14:46:11 -08:00
Nicole Thomas
a700dfcf13 Merge pull request #17321 from cachedout/develop_17000 
Re-submit of #17120
 2014-11-12 15:23:29 -07:00
Colton Myers
c31f6eb06a Merge pull request #17914 from nmadhok/utils-python3-raetevent 
Making salt.utils.raetevent python3 compatible
 2014-11-12 15:15:53 -07:00
Samuel M Smith
182f4b08f0 Fix race condition with Raet Salt Caller where the minion caller could cleanup (erase) the cli salt-call lanestack 2014-11-12 15:11:16 -07:00
Colton Myers
0005393307 Merge pull request #17921 from nmadhok/utils-python3-jinja 
Making salt.utils.jinja python3 compatible
 2014-11-12 15:08:18 -07:00
Colton Myers
987337964c Merge pull request #17925 from nmadhok/utils-python3-files 
Making salt.utils.files python3 compatible
 2014-11-12 15:07:15 -07:00
Colton Myers
78be454a37 Merge pull request #17928 from nmadhok/utils-python3-doc 
Making salt.utils.doc python3 compatible
 2014-11-12 15:06:34 -07:00
Colton Myers
754876515b Merge pull request #17966 from nmadhok/python3-states-win_system 
Making salt.states.win_system python3 compatible
 2014-11-12 15:03:25 -07:00
Colton Myers
96a33591c1 Merge pull request #18027 from nmadhok/netapi/rest_cherrypy-python3-app 
Making salt/netapi/rest_cherrypy/app python3 compatible
 2014-11-12 14:57:20 -07:00
Nicole Thomas
ddd9aa6544 Merge pull request #18015 from nmadhok/client/ssh/wrapper-python3-config 
Making salt/client/ssh/wrapper/config python3 compatible
 2014-11-12 14:45:52 -07:00
Nicole Thomas
6712fe834b Merge pull request #18014 from nmadhok/client/ssh/wrapper-python3-cp 
Making salt/client/ssh/wrapper/cp python3 compatible
 2014-11-12 14:45:35 -07:00
Nicole Thomas
778776bd77 Merge pull request #18013 from nmadhok/client/ssh/wrapper-python3-grains 
Making salt/client/ssh/wrapper/grains python3 compatible
 2014-11-12 14:45:23 -07:00
Nicole Thomas
4b9cc7e988 Merge pull request #18012 from nmadhok/client/ssh/wrapper-python3-pillar 
Making salt/client/ssh/wrapper/pillar python3 compatible
 2014-11-12 14:45:00 -07:00
Nicole Thomas
901ee80a04 Merge pull request #18009 from nmadhok/daemons/flo-python3-maint 
Making salt/daemons/flo/maint python3 compatible
 2014-11-12 14:44:24 -07:00
Nicole Thomas
3b09cf1e25 Merge pull request #18008 from nmadhok/daemons/flo-python3-worker 
Making salt/daemons/flo/worker python3 compatible
 2014-11-12 14:43:45 -07:00
Nicole Thomas
395146eefe Merge pull request #18007 from nmadhok/daemons/test-python3-test_minion 
Making salt/daemons/test/test_minion python3 compatible
 2014-11-12 14:42:51 -07:00
Colton Myers
951dd3c2a0 Merge pull request #18017 from nmadhok/client/ssh-python3-state 
Making salt/client/ssh/state python3 compatible
 2014-11-12 14:42:07 -07:00
Colton Myers
c651731e5b Merge pull request #18018 from nmadhok/client/ssh-python3-shell 
Making salt/client/ssh/shell python3 compatible
 2014-11-12 14:41:57 -07:00
Colton Myers
362d7a3161 Merge pull request #18019 from nmadhok/client/ssh-python3-__init__ 
Making salt/client/ssh/__init__ python3 compatible
 2014-11-12 14:40:20 -07:00
Nicole Thomas
29ea287581 Merge pull request #18016 from nmadhok/client/ssh/wrapper-python3-__init__ 
Making salt/client/ssh/wrapper/__init__ python3 compatible
 2014-11-12 14:40:08 -07:00
Colton Myers
7893c44f08 Merge pull request #18022 from nmadhok/netapi/rest_tornado-python3-saltnado 
Making salt/netapi/rest_tornado/saltnado python3 compatible
 2014-11-12 14:39:55 -07:00
Colton Myers
002a68b990 Merge pull request #18021 from nmadhok/netapi/rest_tornado-python3-saltnado_websockets 
Making salt/netapi/rest_tornado/saltnado_websockets python3 compatible
 2014-11-12 14:39:42 -07:00
Nicole Thomas
124ad307ec Merge pull request #18011 from nmadhok/daemons/flo-python3-__init__ 
Making salt/daemons/flo/__init__ python3 compatible
 2014-11-12 14:37:37 -07:00
Colton Myers
dfc6e27411 Merge pull request #18023 from nmadhok/netapi/rest_tornado-python3-event_processor 
Making salt/netapi/rest_tornado/event_processor python3 compatible
 2014-11-12 14:37:19 -07:00