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
77,689 Commits 24 Branches 182 Tags 341 MiB
58e16a0d39
Commit Graph

77689 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rallytime
315b2c8712 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/modules/win_system.py
  - tests/unit/modules/win_system_test.py
 2017-01-18 14:16:45 -07:00
Mike Place
88faf08a71 Merge pull request #38811 from techhat/sanvm 
Show a lot less data when requesting a VM
 2017-01-18 14:08:02 -07:00
Mike Place
d14f0c64eb Merge pull request #38812 from rallytime/pyobjects-test 
Update pyobjects test to be a list
 2017-01-18 14:06:00 -07:00
Mike Place
50f03f8057 Merge pull request #38813 from gtmanfred/2016.3 
catch SIGPIPE in vmware connection
 2017-01-18 14:05:41 -07:00
Daniel Wallace
ce3472cec2 catch SIGPIPE in vmware connection 2017-01-18 13:58:04 -06:00
Mike Place
23b8b47258 Merge pull request #38809 from twangboy/fix_hostname_2016.3 
Fix get_hostname to handle longer computer names
 2017-01-18 12:31:59 -07:00
rallytime
f3e84c1ab7 Update pyobjects test to be a list 
Refs the discussion in https://github.com/saltstack/salt/issues/21796#issuecomment-84454088
 2017-01-18 12:16:30 -07:00
Joseph Hall
47c19325cf Show a lot less data when requesting a VM 2017-01-18 12:13:23 -07:00
David Boucha
dbe9edb806 fix reactor example. 
This version is tested on 2016.11 branch and was found working
ZD 1035
 2017-01-18 11:46:34 -07:00
Colin Evans
3807e2c2d9 Fix test failure - change "set += list" to "set.update(list)" 2017-01-18 13:38:10 -05:00
twangboy
d57a51f9f9 Fix tests for get_hostname 2017-01-18 11:27:50 -07:00
markuskramerIgitt
db78d5c20e Merge branch 'develop' of https://github.com/markuskramerIgitt/salt into develop 2017-01-18 19:20:51 +01:00
Mike Place
1033bbdde8 Merge pull request #38808 from vutny/fix-38388 
Fix #38388
 2017-01-18 11:19:35 -07:00
twangboy
7ca3fd7484 Fix get_hostname to handle longer computer names 2017-01-18 11:19:22 -07:00
Megan Wilhite
a8a6215663 refine the os detection in archive test (#38807) 2017-01-18 11:03:55 -07:00
Mike Place
f3ae3cd5c8 Merge pull request #38668 from terminalmage/issue38604 
Fix proposal for #38604
 2017-01-18 10:53:08 -07:00
Denys Havrysh
9bd203ffcc Fix #38388 
If `log_level_logfile` is not set explicitly it should inherit the
level set by `log_level` configuration option.
 2017-01-18 19:16:38 +02:00
Mike Place
c6a19a9e5a Merge pull request #38789 from rallytime/fix-38622 
Update some saltenv refs to environment in salt.modules.state docs
 2017-01-18 08:39:21 -07:00
Mike Place
e0bf700020 Merge pull request #38790 from cachedout/fix_pyobjects_test_typo 
Fix typo in pyobjects test
 2017-01-18 08:38:56 -07:00
Mike Place
6e9785edea Merge pull request #38792 from rallytime/fix-38629 
Update pillar tutorial lanuage regarding pillar_opts settings
 2017-01-18 08:38:18 -07:00
Mike Place
ad667d33e8 Merge pull request #38797 from SaltyCharles/patch-5 
update gitfs.rst for clarity
 2017-01-18 08:33:18 -07:00
Mike Place
e3ca6881c8 Merge pull request #38799 from aosagie/fix-ansible-dynamic-roster 
Parse ansible dynamic inventory output correctly
 2017-01-18 08:32:47 -07:00
Colin Evans
1a55e55998 Use os module path separator instead of POSIX, and modify logging statement to preferred format. 2017-01-18 10:24:31 -05:00
Bo Maryniuk
eb25e2f768 Add a salt-minion service control file 2017-01-18 15:38:53 +01:00
Bo Maryniuk
ffbd45062e Explain what it is about and how to configure that 2017-01-18 15:02:11 +01:00
Alexey Aksenov
135f523999 [38451] Fix few bugs after review 2017-01-18 14:51:27 +03:00
Nicole Thomas
76df6a43f3 Merge pull request #38787 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2017-01-18 01:39:07 -07:00
markuskramerIgitt
b25542a66d Version must be set 2017-01-18 02:09:04 +01:00
twangboy
f00a65355d change extensions .ext to .exe 2017-01-17 17:55:18 -07:00
SaltyCharles
e127013892 update gitfs.rst for clarity 
Add note for "Unsupported URL Protocol" error when using pygit2 without libssh2.
 2017-01-17 15:44:00 -08:00
rallytime
2aad54c49f Merge branch '2016.3' into '2016.11' 
No conflicts.
 2017-01-17 16:24:42 -07:00
Mike Place
3417adc617 Merge pull request #38796 from saltstack/revert-38707-root_dir_fix-gh 
Revert "Fixed prepending of root_dir override to the other paths"
 2017-01-17 16:18:17 -07:00
Mike Place
cb080f3bbe Revert "Fixed prepending of root_dir override to the other paths" 2017-01-17 16:17:41 -07:00
Erik Johnson
0ea97cdad9 Merge pull request #10 from cachedout/pr-38668 
Munge retcode into return data for batching
 2017-01-17 17:10:20 -06:00
Ethan Moore
d71ffcf4f3 fix bonehead typo 2017-01-17 22:16:50 +00:00
markuskramerIgitt
559bee31f9 no pause 2017-01-17 23:02:10 +01:00
markuskramerIgitt
a789241c0c Add test for git, omit cls to show result of tests. 2017-01-17 22:58:21 +01:00
rallytime
1e125e2844 Update pillar tutorial lanuage regarding pillar_opts settings 
The pillar_opts option defaults to ``False``. This change updates
the language in the pillar tutoral to be in-line with the default
setting.

Fixes #38629
 2017-01-17 14:55:17 -07:00
Mike Place
a66afb5f0f
Fix typo in pyobjects test 2017-01-17 13:57:20 -07:00
Ethan Moore
de523f857a lint fixes 2017-01-17 20:11:23 +00:00
rallytime
af41fe0c6e Update some saltenv refs to environment in salt.modules.state docs 
If saltenv is not specified in some of these functions, the the
"environment" option is used instead.

Fixes #38622
 2017-01-17 12:17:00 -07:00
rallytime
64d866f7ab Merge branch '2016.3' into '2016.11' 
No conflicts.
 2017-01-17 11:44:26 -07:00
Mike Place
04bf3af6bb Merge pull request #38785 from rallytime/doc-test-fix 
Add CLI Examples for functions in the namecheap_ns execution module
 2017-01-17 11:44:20 -07:00
Mike Place
bab3479a3c Merge pull request #38585 from rallytime/follow-up-38527 
Follow up to PR #38527
 2017-01-17 11:40:01 -07:00
Mike Place
4e6146f65f Merge pull request #38660 from techhat/cachedir 
Don't force salt.cache to use cachedir from opts
 2017-01-17 11:38:34 -07:00
Mike Place
1bc6ab9f1b Merge pull request #38783 from lomeroe/adml_search_fix 
Perform a "starts-with" search to match ADML text names
 2017-01-17 11:34:38 -07:00
Mike Place
db81afc035
Munge retcode into return data for batching 2017-01-17 11:31:45 -07:00
Nicole Thomas
6f23a946cd Merge pull request #38784 from rallytime/merge-develop 
[develop] Merge forward from 2016.11 to develop
 2017-01-17 11:25:33 -07:00
rallytime
05587201b6 Pylint fix: add line at end of file 2017-01-17 10:26:43 -07:00
rallytime
a13caacba4 Add CLI Examples for functions in the namecheap_ns execution module 2017-01-17 10:24:03 -07:00