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
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
Corin Kochenower
911345dd1a
Add versionadded label for event_return
2015-04-07 14:15:03 -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
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
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
Thomas S Hatch
393ee4c87d
Merge pull request #22390 from cro/pyshtrue_unless_onlyif
...
Allow unless, onlyif, check_cmd to use python_shell=True
2015-04-07 09:15:11 -06:00
Thomas S Hatch
aec21a6816
Merge pull request #22377 from Lendar/file-recurse-unicode
...
Support unicode in file.recurse
2015-04-07 09:14:37 -06:00
Thomas S Hatch
ebdf143c7e
Merge pull request #22350 from jacksontj/2015.2
...
2015.2: Fix batching
2015-04-07 09:13:46 -06:00
Thomas S Hatch
234cb65a23
Merge pull request #22319 from plastikos/improvement-pillar_pcre
...
Improvement: add pillar PCRE matching
2015-04-07 09:09:49 -06:00
Mike Place
0b1f3a1b00
Lint
2015-04-07 08:42:34 -06:00
Justin Findlay
d640823767
Merge pull request #22407 from jayeshka/win_servermanager-unit-test
...
adding win_servermanager unit test case.
2015-04-07 08:40:33 -06:00
Mike Place
ea97a9e600
Merge pull request #22410 from jayeshka/smtp-unit-test
...
adding smtp unit test case.
2015-04-07 08:25:25 -06:00
Nicole Thomas
d06df7f1e9
Merge pull request #22405 from rahulhan/states_git_unit_test
...
Adding git.py (states) unit tests
2015-04-07 07:47:50 -06:00
Nicole Thomas
0ec0c20996
Merge pull request #22404 from rahulhan/win_path_test
...
Adding win_path.py unit test cases
2015-04-07 07:43:01 -06:00
Nicole Thomas
28630b4bd6
Merge pull request #22400 from jfindlay/cmd_state_tests
...
adding cmd.run state integration tests
2015-04-07 07:40:09 -06:00
Nicole Thomas
fcbb82e66b
Merge pull request #22389 from basepi/salt-ssh-returners
...
[2015.2] Pass the `fun` to the returners in salt-ssh
2015-04-07 07:32:36 -06:00
Jayesh Kariya
605d4f3ea9
adding smtp unit test case.
2015-04-07 17:39:32 +05:30
Jayesh Kariya
a0cd8189de
adding win_servermanager unit test case.
2015-04-07 15:44:24 +05:30
Rahul Handay
a807d2c55b
Adding git.py (states) unit tests
2015-04-07 15:05:25 +05:30
Rahul Handay
7462556283
Adding win_path.py unit test cases
2015-04-07 14:16:45 +05:30
Justin Findlay
38482a5b11
Merge pull request #22395 from twangboy/port_pip
...
Fixed problem with pip not working on portable install
2015-04-06 22:09:22 -06:00
Justin Findlay
fceb83bf16
sort integration test minion return lists
2015-04-06 22:07:56 -06:00
Justin Findlay
56364ff571
adding cmd.run state integration tests
2015-04-06 20:32:22 -06:00
Shane Lee
b71602a39c
Update BuildSalt.bat
2015-04-06 17:52:58 -06:00
Shane Lee
4a3a8b4606
Update BuildSalt.bat
2015-04-06 17:52:38 -06:00
Shane Lee
ba1d3965d2
Update BuildSalt.bat
2015-04-06 17:51:49 -06:00
Shane Lee
8e8b4fb26f
Update BuildSalt.bat
2015-04-06 17:50:49 -06:00
Thomas Jackson
5d8a4d7ab7
Add timeout to batch tests
2015-04-06 16:46:44 -07:00
Thomas Jackson
27c62bf046
Cleanup pylint errors
2015-04-06 16:46:44 -07:00
Thomas Jackson
a823299d96
Re-work batching to more closely match CLI usage
...
In the regular CLI we consider a job as completed once all minions aren't running the job anymore. In this batching implementation we will ping all minions, wait up to timeout, then start the batching. In the event of minions returning during the batching we'll add them to the list of targets.
2015-04-06 16:46:44 -07:00
Thomas Jackson
2c89983424
Stop chdir() in pcre minions
2015-04-06 16:46:44 -07:00
Thomas Jackson
f4a28a77f6
Stop the os.chdir() to do glob
2015-04-06 16:46:44 -07:00
Thomas Jackson
7369f951ca
More clear about CKMinions' purpose in the docstring
2015-04-06 16:46:44 -07:00
Thomas Jackson
7af94fb85d
Revert "Just use ckminions in batch mode."
...
This reverts commit 6c5f3f8d2e
2015-04-06 16:46:44 -07:00
Thomas Jackson
4e5480b88a
Fix CKMinions _check_range_minions
...
In the localclient the range return is already assumed to be a list of the minion_ids. This implementation assumed it was returning a list of fqdns, which makes for unecessary complications. In addition we were making the same range expand N times (N being the number of *total* minions)-- which is a LOT.
2015-04-06 16:46:44 -07:00
salt_build
c898b951bc
Fixed problem with pip not working on portable install
2015-04-06 23:04:24 +00:00
Mike Place
f07e8b0499
Merge pull request #22393 from kev009/2015.2-docs
...
2015.2 relnotes edits
2015-04-06 15:45:57 -06:00
Kevin Bowling
f324d38f8c
2015.2 relnotes edits
2015-04-06 14:36:51 -07:00
C. R. Oldham
977d9accf0
Allow unless, onlyif, check_cmd to use python_shell=True
2015-04-06 14:20:08 -06:00
Colton Myers
b493269140
Pass the fun to the returners in salt-ssh
2015-04-06 12:42:34 -06:00
Nicole Thomas
ffae7d6170
Merge pull request #22375 from ckochenower/2015.2
...
Modify the Cassandra management and returner modules
2015-04-06 12:36:31 -06:00
