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
36,373 Commits 24 Branches 182 Tags 341 MiB
573390d8ad
Commit Graph

36373 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nicole Thomas
573390d8ad Merge pull request #17054 from jacksontj/2014.7 
Fix for #17051
 2014-10-31 10:14:16 -06:00
Nicole Thomas
febd925453 Merge pull request #17069 from cachedout/issue_17055 
Fix failing tests
 2014-10-31 09:16:55 -06:00
Mike Place
a0a0512cf5 Fix failing tests 2014-10-31 08:35:23 -06:00
Pedro Algarvio
8e00178a88 Merge pull request #17049 from terminalmage/quickfix 
Fix nonsense language in error message
 2014-10-31 04:13:26 +00:00
C. R. Oldham
d44a4739c7 Merge pull request #17059 from cro/nssm_update 
Update nssm to latest 2.24 (2014-08-31 release)
 2014-10-30 22:16:47 -04:00
C. R. Oldham
6c9be002c5 Update nssm to 2.24 2014-10-30 22:15:26 -04:00
Thomas Jackson
6262d44d50 Add "normalize_ret" function, so we don't have to copy/paste so much 
Add checks for "changes" since we want to test cases where there aren't changes to be made
 2014-10-30 16:58:03 -07:00
Thomas Jackson
d2b548a0e7 Add regression test for #17051 2014-10-30 16:43:06 -07:00
Thomas Jackson
5cf110b80c Fix for #17051 2014-10-30 16:03:00 -07:00
Colton Myers
2fec4d01d6 Merge pull request #17048 from terminalmage/osxdestkop-virtual 
Use salt.utils.is_darwin() for __virtual__ in osxdesktop module
 2014-10-30 16:17:55 -06:00
Erik Johnson
90258b6ecf don't load on windows 2014-10-30 15:43:15 -06:00
Erik Johnson
5a84887c4c add virtual function 2014-10-30 15:42:55 -06:00
Erik Johnson
8d2d885f62 reword docstring 2014-10-30 15:02:30 -06:00
Erik Johnson
3e2891454e Fix nonsense language in error message 2014-10-30 15:00:50 -06:00
Mike Place
5137f3dfb4 Merge pull request #17044 from jacksontj/2014.7 
Nicer error message on service state when you watch enable/disable
 2014-10-30 14:21:25 -06:00
Erik Johnson
1cee8978c8 Use salt.utils.is_darwin() for __virtual__ in osxdesktop module 2014-10-30 14:07:23 -06:00
Nicole Thomas
e20ad37dac Merge pull request #17045 from rallytime/fix_pylint 
Remove extra lines
 2014-10-30 14:01:42 -06:00
rallytime
705494fedb Remove extra lines 2014-10-30 13:49:02 -06:00
Joseph Hall
6f460f98d6 Merge pull request #17043 from garethgreenaway/16929_2014_7 
Minor fix to smtp module
 2014-10-30 12:38:55 -06:00
Thomas Jackson
97329d5572 Nicer error message on service state when you watch enable/disable 2014-10-30 11:38:30 -07:00
Gareth J. Greenaway
160003e749 Clarifying documention for smtp module. 2014-10-30 11:27:46 -07:00
Nicole Thomas
cea2f57f55 Merge pull request #17039 from terminalmage/issue17017 
Fix state.sls_id
 2014-10-30 11:37:31 -06:00
Nicole Thomas
bc2a90924c Merge pull request #17037 from rallytime/bp-16932 
Backport #16932 to 2014.7
 2014-10-30 11:13:16 -06:00
Nicole Thomas
f4d494d941 Merge pull request #17038 from rallytime/bp-16980 
Backport #16980 to 2014.7
 2014-10-30 11:13:02 -06:00
Nicole Thomas
7ac5e9e76e Merge pull request #17036 from rallytime/bp-16965 
Backport #16965 to 2014.7
 2014-10-30 11:11:37 -06:00
Erik Johnson
1eb0ad3e0a Fix state.sls_id 
This resolves three issues:

1. outputter not properly specified for this function
2. multiple state declarations under the same ID declaration are not
   reflected in the output
3. traceback occurs when ID is not found in the specified mods
 2014-10-30 10:48:19 -06:00
Thomas S Hatch
8f706a4b96 Merge pull request #17030 from s0undt3ch/2014.7 
Actually kill the tests sshd process. Provide a custom know_hosts file to use
 2014-10-30 10:47:28 -06:00
Thomas S Hatch
328c16ed2d Merge pull request #17009 from cachedout/issue_16999 
Refactor salt.utils.filecopy() out of salt.utils
 2014-10-30 10:44:20 -06:00
Thomas S Hatch
0177b8aa7e Merge pull request #16983 from UtahDave/2014.7local 
Fix file.managed backup feature on Windows
 2014-10-30 10:38:02 -06:00
Thomas S Hatch
b8777227db Merge pull request #16977 from cachedout/issue_16488 
Prevent stacktrace if wrong type in outputter with state_verbose False
 2014-10-30 10:37:09 -06:00
Mike Place
76cfde8b71 Explain reason for key rejection. 
Closes #16284
 2014-10-30 10:17:08 -06:00
Bahadır Kandemir
7e3da192dc Don't execute query if test mode is enabled. 
Fixes 16756
 2014-10-30 10:15:21 -06:00
Mike Place
e3f78f5303 Ignore failover check for syndics. 
Refs #16923
 2014-10-30 10:13:04 -06:00
Thomas S Hatch
a9f41b0972 Merge pull request #16918 from krak3n/feature-docker-inspect-running-containers 
dockerio.get_containers optional call to dockerio._get_container_infos
 2014-10-30 10:09:34 -06:00
Joseph Hall
3b098ec8f8 Merge pull request #16974 from s0undt3ch/hotfix/16945-sftp-opts 
Make sure `kwargs=None` is properly handled. Fixes #16945.
 2014-10-30 06:00:14 -06:00
Joseph Hall
ada851aaa4 Merge pull request #17020 from s0undt3ch/hotfix/bootstrap-script 
Update to latest stable release of the bootstrap script, v2014.10.30
 2014-10-30 05:59:36 -06:00
Pedro Algarvio
17564057c9 Actually kill the tests sshd process. Provide a custom know_hosts file to use. 2014-10-30 06:45:52 +00:00
Pedro Algarvio
b4b064dab2 Remove the "unknown" fallback 2014-10-30 01:32:22 +00:00
Pedro Algarvio
77e7167fb0 Update to latest stable release of the bootstrap script, v2014.10.30 
* Apply the forking patch to openSUSE git installations.
 2014-10-30 01:26:54 +00:00
Seth House
53dae1b3e4 Merge pull request #17019 from whiteinge/doc-salt-api-2014.7-release-notes 
Added the salt-api merge and recent additions to 2014.7 release notes
 2014-10-29 18:16:16 -05:00
Seth House
36ca21de0c Added the salt-api merge and recent additions to 2014.7 release notes 2014-10-29 18:15:03 -05:00
Nicole Thomas
500afb29fe Merge pull request #16962 from jacksontj/2014.7 
2014.7
 2014-10-29 16:19:03 -06:00
Nicole Thomas
549ef0066c Merge pull request #17008 from terminalmage/issue16926 
Fix check_cmd behavior for file.managed state
 2014-10-29 16:13:09 -06:00
Erik Johnson
b6465332a0 Merge pull request #17013 from whiteinge/doc-rest_cherrypy-key 
Added missing docs for the /key rest_cherrypy entry point
 2014-10-29 15:39:10 -06:00
Thomas Jackson
52f7216bea Revert naming here too 2014-10-29 14:35:27 -07:00
Seth House
9da07584e4 Added missing docs for the /key rest_cherrypy entry point 
Should have been part of #16706.
 2014-10-29 16:35:04 -05:00
C. R. Oldham
060cae8edc Merge pull request #16959 from whiteinge/apache_modules-test-mode 
Fix apache_module states to return None and changes dict in test mode
 2014-10-29 17:31:39 -04:00
Colton Myers
90599c520a Merge pull request #17001 from basepi/peerminepillar 
Disable compound/pillar matching for mine/peer
 2014-10-29 14:59:44 -06:00
Thomas Jackson
6612aa808e Revert spelling fix, since its a variable name :) 2014-10-29 13:56:44 -07:00
Thomas Jackson
79d56c51d4 Fix bug in grains outputter 
The grain that sets the locale_info doesn't set it in the correct namespace (at least what everyone else including the tests are expecting). This means you get traces when you do a grains.setval something like:

```
[DEBUG   ] Traceback (most recent call last):
  File "/usr/lib/python2.6/site-packages/salt/output/__init__.py", line 36, in display_output
    display_data = get_printout(out, opts)(data).rstrip()
  File "/usr/lib/python2.6/site-packages/salt/output/grains.py", line 33, in output
    encoding = grains['locale_info']['defaultencoding']
KeyError: 'locale_info'
```
 2014-10-29 13:47:24 -07:00