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,340 Commits 24 Branches 182 Tags 341 MiB
0177b8aa7e
Commit Graph

36340 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Thomas Jackson
1996302399 Add a default saltenv, to match the rest 2014-10-29 13:40:31 -07:00
Thomas Jackson
9697685b21 Fix typo 2014-10-29 13:37:30 -07:00
Erik Johnson
957201e9e7 Fix check_cmd behavior for file.managed state 
Resolves #16926.
 2014-10-29 14:29:05 -06:00
Colton Myers
63e8caa650 Fix a typo and normalize tuples 2014-10-29 14:09:14 -06:00
Colton Myers
a4b66eac45 Also remove the expr_form match for compound 2014-10-29 14:05:31 -06:00
Colton Myers
96caa86ac5 Fix typo 2014-10-29 11:29:04 -06:00
Colton Myers
81728f83f7 Disable compound/pillar targeting for peer, minion-side 2014-10-29 11:27:31 -06:00
Colton Myers
046d7aafe9 Disable pillar/compound for mine.get, master-side 2014-10-29 11:25:23 -06:00
Colton Myers
868fdc86da Disable compound matching for pillar.get, minion-side 2014-10-29 11:21:13 -06:00
Colton Myers
12b71bdc59 Disable pillar/compound matching for peer interface, master-side 2014-10-29 11:18:03 -06:00
Pedro Algarvio
cb19ad0ca3 Fix syntax error 2014-10-29 06:28:09 +00:00
Thomas Jackson
f997d24cfa Change syndic_wait in get_iter_returns 
This will ensure we only do the quick return if you are *not* a syndic, since when you are a syndic we have no idea what the target is-- so we have to wait. This means that syndic masters (the master of masters) will have at least syndic_wait seconds until the return comes back
 2014-10-28 17:19:43 -07:00
David Boucha
a637c12156 fix pylint error 2014-10-28 17:27:25 -06:00
David Boucha
c5261c2097 add comment that ':' is illegal on Windows 
Windows file paths and names cannot contain a ':'
 2014-10-28 16:47:51 -06:00
David Boucha
2d4e17afdc add missing module import 2014-10-28 16:39:57 -06:00
David Boucha
56b7a0910b Fix file.managed backup feature on Windows 2014-10-28 16:20:24 -06:00
Joseph Hall
0d0f2ddb7e Merge pull request #16976 from s0undt3ch/hotfix/16695-blacklist-openstack.list_locations 
Add `{rackspace,openstack}.list_locations` to the unsupported cloud functions
 2014-10-28 14:38:44 -06:00
Mike Place
6b819114c8 Prevent stacktrace if wrong type in outputter with state_verbose False 
Closes #16488
 2014-10-28 14:15:19 -06:00
Pedro Algarvio
2b4c2b7be8 Add {rackspace,openstack}.list_locations to the unsupported cloud functions. 
Fixes #16695
 2014-10-28 19:46:46 +00:00
Pedro Algarvio
200d4c05b5 Make sure kwargs=None is properly handled. Fixes #16945. 2014-10-28 19:26:25 +00:00
Seth House
92986c3122 Merge pull request #16971 from juiceinc/2014.7 
Add a default value for saltenv arg in state.sls_id module
 2014-10-28 14:01:20 -05:00
Tim O'Guin
8009d56cce pass default saltenv='base' to state.sls_id module 2014-10-28 13:57:01 -05:00
Seth House
c0c0480b73 Merge pull request #16968 from UtahDave/2014.7local 
2014.7local
 2014-10-28 13:06:30 -05:00
Seth House
b1caefe9d6 Merge pull request #16966 from UtahDave/fix_windows_unicode_error 
fix error when Windows users has unicode character
 2014-10-28 12:56:05 -05:00
David Boucha
691475c470 autoaccept passwords > 14 chars 2014-10-28 11:15:37 -06:00
David Boucha
a2bc3be118 fix error when Windows users has unicode character 2014-10-28 10:52:33 -06:00
David Boucha
285a40f639 add ability to set passwd on Windows user creation 
Some Windows systems do not permit creation of a user without
a password.

Fixes #16871
 2014-10-28 10:31:41 -06:00
Thomas Jackson
4a6f0a3c20 Cleanup logging output (to not be confusing) 2014-10-28 08:58:45 -07:00
Colton Myers
3d256b2d3f Merge pull request #16947 from s0undt3ch/hotfix/bootstrap-script 
Update to the latest bootstrap script, v2014.10.28
 2014-10-28 09:46:42 -06:00
Thomas Jackson
4d6a46d8b3 Fix for #16939 
In the case that the master-master has no immediate downstream minions we were just incrementing the syndic_wait N times and then exiting, not pinging the lower level masters/minions. Now, I've consolidate the jinfo_timeout and timeout_at (since they were the same thing) and changed it to add syndic_wait to the timeout_at if you are a master-master, have more time to add, and would have timed out.
 2014-10-28 08:45:49 -07:00
Thomas Jackson
75974d95c5 More spelling 2014-10-28 08:13:43 -07:00
Thomas Jackson
7cef805774 More spelling 2014-10-28 08:13:25 -07:00