valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
46,857 Commits 24 Branches 182 Tags 341 MiB
65adbce5e7
Commit Graph

46857 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rahul Handay
65adbce5e7 Adding states/host.py unit test cases 2015-04-09 13:02:15 +05:30
Justin Findlay
654f5c58bd Merge pull request #22488 from ckochenower/2015.2 
Fix cassandra_cql execution module documentation/examples
 2015-04-08 22:45:49 -06:00
Corin Kochenower
21435834d0 Fix cassandra_cql execution module documentation/examples 2015-04-08 20:10:50 -06:00
Nicole Thomas
595051aa0c Merge pull request #22468 from basepi/merge-forward-2015.2 
[2015.2] Merge forward from 2014.7 to 2015.2
 2015-04-08 16:58:37 -06:00
Nicole Thomas
9f5a414761 Merge pull request #22443 from garethgreenaway/2015_2_fix_runner_doc 
Fixes to sysmod.py
 2015-04-08 16:57:07 -06:00
Thomas S Hatch
d5cbabc37d Merge pull request #22441 from cro/missing_patch 
Throw better error if no patch exec found
 2015-04-08 13:05:29 -06:00
Colton Myers
5f1a4b45b8 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 2015-04-08 10:38:34 -06:00
Justin Findlay
ad7b066dce Merge pull request #22455 from jayeshka/grains-unit-test 
adding states/grains unit test case.
 2015-04-08 09:05:30 -06:00
Nicole Thomas
f8d81dde1e Merge pull request #22459 from jayeshka/smtp_states-unit-test 
adding states/smtp unit test case.
 2015-04-08 08:45:27 -06:00
Nicole Thomas
2fd7b8c3b2 Merge pull request #22457 from jayeshka/sysctl-unit-test 
adding states/sysctl unit test case.
 2015-04-08 08:43:06 -06:00
Nicole Thomas
fa14bd128e Merge pull request #22456 from rahulhan/states_svn_unit_test 
Adding states svn.py unit test cases
 2015-04-08 08:42:19 -06:00
Nicole Thomas
0b3baec866 Merge pull request #22454 from rahulhan/win_repo_unit_test 
Adding win_repo.py unit test cases
 2015-04-08 08:38:05 -06:00
Jayesh Kariya
481e2e4ad0 adding states/smtp unit test case. 2015-04-08 17:54:52 +05:30
Jayesh Kariya
5a016c5eda cosmetic change 2015-04-08 17:49:38 +05:30
Jayesh Kariya
705c387368 doc string change. 2015-04-08 17:18:04 +05:30
Jayesh Kariya
a9ba68699a adding states/sysctl unit test case. 2015-04-08 16:25:57 +05:30
Rahul Handay
0fdda87e23 Adding states svn.py unit test cases 2015-04-08 16:20:51 +05:30
Jayesh Kariya
3002729f72 adding states/grains unit test case. 2015-04-08 14:13:20 +05:30
Rahul Handay
ea5a039858 Adding win_repo.py unit test cases 2015-04-08 14:07:03 +05:30
Justin Findlay
ff97167498 Merge pull request #22450 from jacksontj/2015.2 
Remove grains outputter from grains modules
 2015-04-07 22:22:16 -06:00
Nicole Thomas
928a399ef7 Merge pull request #22449 from whiteinge/doc-jinja-strftime-fuzzy 
Separated fuzzy dates from non-fuzzy in strftime Jinja example
 2015-04-07 20:11:46 -06:00
Seth House
d7b1f14133 Merge pull request #22445 from rallytime/fix-19044 
Add docs explaing file_map upload functionality
 2015-04-07 19:34:54 -06:00
Seth House
892f7c8905 Separated fuzzy dates from non-fuzzy in strftime Jinja example 2015-04-07 19:23:38 -06:00
Thomas Jackson
2ca422d967 Remove grains outputter from grains modules 
Since we have removed the grains outputter (#20172) we should stop trying to talk to it
 2015-04-07 18:17:04 -07:00
rallytime
7a9ce92dd9 Add docs explaing file_map upload functionality 
Fixes #16886
 2015-04-07 17:23:02 -06:00
Gareth J. Greenaway
b73351eed8 runner_doc in sysmod requires salt.runner to be imported. 2015-04-07 16:07:44 -07:00
C. R. Oldham
7c2b2157e7 Better missing patch error 2015-04-07 16:33:09 -06:00
Nicole Thomas
77efcffca2 Merge pull request #22439 from rallytime/fix-pylint 
Fix pylint errors that snuck into 2015.2
 2015-04-07 16:17:40 -06:00
Justin Findlay
dd5c68fef3 Merge pull request #22427 from garethgreenaway/22415_2015_2_gpg_module_fixes 
backporting #22422 to 2015.2
 2015-04-07 15:58:02 -06:00
rallytime
6b4b51a7f8 Fix pylint errors that snuck into 2015.2 2015-04-07 15:44:36 -06:00
Justin Findlay
ade247443d Merge pull request #22426 from jraby/patch-1 
don't repeat the "if ret['changes']" condition
 2015-04-07 15:42:39 -06:00
Nicole Thomas
9709fb47cd Merge pull request #22436 from ckochenower/2015.2 
Add versionadded label for event_return
 2015-04-07 15:40:33 -06:00
Justin Findlay
4c8d351dbf Merge pull request #22416 from rallytime/bp-21044 
Backport #21044 to 2014.7
 2015-04-07 15:19:32 -06:00
Justin Findlay
f76c5b4a56 Merge pull request #22433 from rallytime/fix-22218 
Clarify that an sls is not available on a fileserver
 2015-04-07 14:36:10 -06:00
Justin Findlay
70ba52fcee Merge pull request #22434 from rallytime/bp-22414 
Backport #22414 to 2014.7
 2015-04-07 14:34:57 -06:00
Corin Kochenower
911345dd1a Add versionadded label for event_return 2015-04-07 14:15:03 -06:00
Frank Klaassen
4a141c0f89 Lint 2015-04-07 13:19:14 -06:00
Frank Klaassen
09e9b6ea95 Do not look for disk underneath config 2015-04-07 13:19:14 -06:00
rallytime
f22f4dc4fc Clarify that an sls is not available on a fileserver 
Instead of just assuming that it should be looking to the master only.

Refs #22218
 2015-04-07 13:12:58 -06:00
Gareth J. Greenaway
d4f485726e backporting #22422 to 2015.2 2015-04-07 11:12:50 -07:00
Seth House
50bb12d7b0 Added versionaddedd directives to SSHClient 2015-04-07 11:46:27 -06:00
Seth House
1cf7737de4 Added a Runner module that wraps salt-ssh's Python API 2015-04-07 11:45:58 -06:00
jraby
e2aa53899b don't repeat the "if ret['changes']" condition 
I was having a look at the code since I thought https://github.com/saltstack/salt/issues/21422 was still not fixed.
Turns out 8e0a9e2715 (diff-3b447dc835943beb1326f98f684fe783) had fixed it, but the code read strange to me (why have `if not changes` followed by `if changes`?)

This seems more straight forward to me.
 2015-04-07 13:42:41 -04:00
Thomas S Hatch
817d7679f4 Merge pull request #22418 from basepi/merge-forward-2015.2 
[2015.2] Merge forward from 2014.7 to 2015.2
 2015-04-07 11:00:32 -06:00
Thomas S Hatch
1ac0f54bbc Merge pull request #22387 from cachedout/issue_22216 
Check for custom repos when comparing npm packages
 2015-04-07 10:46:08 -06:00
Thomas S Hatch
9808332e8b Merge pull request #22417 from whiteinge/doc-sshclient 
Add SSHClient to the Python API docs
 2015-04-07 10:45:13 -06:00
Colton Myers
25f9b2d2d1 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
    doc/topics/cloud/action.rst
    doc/topics/cloud/function.rst
    doc/topics/reactor/index.rst
 2015-04-07 10:05:35 -06:00
Seth House
30ad8d99df Add SSHClient to the Python API docs 
I'm leaving cmd_sync out on purpose for now until we get eauth support
sorted.
 2015-04-07 09:53:02 -06:00
Mike Place
7dd4b618ba TCP keepalives on the ret side 
It turns out that we were not setting the same keepalive settings on the
connection back to the master on TCP4506 as we were on the inbound side on 4505.

In the past, this technique would have been problematic but now that we are caching
SREQs this is far more viable.
 2015-04-07 09:38:02 -06:00
Thomas S Hatch
80a194bc20 Merge pull request #22401 from jfindlay/api_tests 
sort integration test minion return lists
 2015-04-07 09:15:44 -06:00