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
66,585 Commits 24 Branches 182 Tags 341 MiB
4302adb1fd
Commit Graph

66585 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nicole Thomas
0c00b852ee Merge pull request #31843 from sjorge/2016.3-execption-imgadm 
salt.states.smartos.image_vacuum should not throw and exception
 2016-03-12 19:06:52 -07:00
Sergey Kacheev
5b30336b89 Now a check_file_meta deletes temporary files when test=True 2016-03-12 23:40:11 +06:00
Erik Johnson
5048fa857c Fix duplicate output 2016-03-12 11:02:35 -06:00
Erik Johnson
155b84b88a salt.fileserver: Add ability to clear checkout locks 2016-03-12 11:02:35 -06:00
Erik Johnson
af410d8dd1 Pass through the lock_type 
This is necessary for "salt-run fileserver.clear_lock" to work
 2016-03-12 11:02:35 -06:00
Erik Johnson
3d7796d5dd salt.runners.cache: Add ability to clear checkout locks 2016-03-12 11:02:34 -06:00
Erik Johnson
8e086099f5 salt.utils.gitfs: rewrite locking code 
This does a few things:

1. Introduces the concept of a checkout lock, to prevent concurrent
   "_pillar" master funcs from trying to checkout the repo at the same
   time.
2. Refrains from checking out unless the SHA has changed.
3. Cleans up some usage of the GitProvider subclass' "url" attribute
   when "id" should be used.
 2016-03-12 11:02:34 -06:00
Jorge Schrauwen
495ae6907c salt.states.smartos.image_vacuum should not throw and exception when not running as a highstate 2016-03-12 11:42:03 +00:00
Nicole Thomas
3f88f3a8cf Merge pull request #31839 from jfindlay/2015.8 
add 2015.8.8 release notes
 2016-03-11 16:23:34 -07:00
Justin Findlay
47ac41ba27 add 2015.8.8 release notes 2016-03-11 16:14:54 -07:00
Nicole Thomas
349216787d Merge pull request #31823 from rallytime/bp-31364 
Back-port #31364 to 2016.3
 2016-03-11 14:46:24 -07:00
Nicole Thomas
218c902091 Merge pull request #31834 from jfindlay/2014.7 
add 2014.7.8 release notes
 2016-03-11 14:35:42 -07:00
Justin Findlay
358fdad0c8 add 2014.7.8 release notes 2016-03-11 14:31:51 -07:00
Erik Johnson
06b212519c Add GitLockError exception class 2016-03-11 15:23:24 -06:00
Nicole Thomas
a423c6cd04 Merge pull request #31833 from jfindlay/2014.7 
add 2014.7.9 release notes
 2016-03-11 14:19:55 -07:00
justinta89
c07b0a20b5 Merge branch 'lint_fixes' into udpate_pylintrc 2016-03-11 14:10:43 -07:00
Justin Findlay
6910fcc584 add 2014.7.9 release notes 2016-03-11 14:08:55 -07:00
Erik Johnson
ad04ccfb93 Strip whitespace when splitting 2016-03-11 15:05:57 -06:00
Nicole Thomas
c5e7c03953 Merge pull request #31826 from gtmanfred/2014.7 
Remove ability of authenticating user to specify pam service
 2016-03-11 13:41:01 -07:00
Nicole Thomas
46bdd10a56 Merge pull request #31828 from gtmanfred/2015.8 
Remove ability of authenticating user to specify pam service
 2016-03-11 13:40:37 -07:00
Nicole Thomas
0cc1d5db03 Merge pull request #31827 from gtmanfred/2015.5 
Remove ability of authenticating user to specify pam service
 2016-03-11 13:40:18 -07:00
justinta89
2e6a152308 Fixed lint error in lxc.py 2016-03-11 12:54:20 -07:00
justinta89
908ca1a439 Fixed lint error in ssh_py_shim 2016-03-11 12:52:52 -07:00
justinta89
404c1b50f7 Changed range(len()) to enumerate() 2016-03-11 11:50:05 -07:00
justinta89
1e13586546 Changed range(len()) to enumerate() 2016-03-11 11:48:33 -07:00
justinta89
9ccce7a9a5 Added more disables 2016-03-11 11:29:21 -07:00
Daniel Wallace
979173b78a Remove ability of authenticating user to specify pam service 
This should be set at the master level, so that whoever is
authenticating has to conform to what is set by the administrator that
setup salt.
 2016-03-11 11:25:48 -07:00
Daniel Wallace
7c3134a3d3 Remove ability of authenticating user to specify pam service 
This should be set at the master level, so that whoever is
authenticating has to conform to what is set by the administrator that
setup salt.
 2016-03-11 11:24:37 -07:00
justinta89
9c1aab3b4e Updated .testing.pylintrc to match newer versions of pylint 2016-03-11 10:59:43 -07:00
Daniel Hobley
55f7ab1fba Fixed a bug where a cert was not correctly updated 
If the certificate supplied had a different hash than the previous but the name was the same the change was ignored, this commit fixes that.
 2016-03-11 11:52:15 -06:00
Daniel Wallace
d73f70ebb2 Remove ability of authenticating user to specify pam service 
This should be set at the master level, so that whoever is
authenticating has to conform to what is set by the administrator that
setup salt.
 2016-03-11 10:42:04 -07:00
Christian McHugh
4d516adade raise error on unsupported distro 2016-03-11 10:18:40 -07:00
Dmitry Kuzmenko
192286fd74 Don't send REQ while another one is waiting for response. 
The message has to be removed from the queue the only *after* it's
already processed to don't confuse send() functionality that expects
empty queue means: there's no active sendings.
 2016-03-11 10:16:09 -07:00
Daniel Hobley
4b31241378 Added shell escaping for security reasons 2016-03-11 11:09:17 -06:00
Nicole Thomas
877aed1ae5 Merge pull request #31569 from twangboy/reg_pkg 
Use win_reg for registry calls
 2016-03-11 09:46:11 -07:00
Andreas Lutro
83fa136da7 work on event logging 
- don't log event data on returner not found
- only log event data if log_level is debug or lower
 2016-03-11 17:37:56 +01:00
Erik Johnson
21600a5478 Merge pull request #31806 from rallytime/github-mod-updates 
Update github module to be more user-friendly
 2016-03-11 10:15:32 -06:00
Nicole Thomas
3d370b471c Merge pull request #31787 from alprs/fix-influxdb_user 
Fix user_create and db_create for new versions of influxdb
 2016-03-11 08:19:22 -07:00
Christophe Drevet-Droguet
dcd6f5a5a9 test for file.apply_template_on_contents 2016-03-11 12:44:26 +01:00
Christophe Drevet-Droguet
10d882296d file.managed: templating contents, not just files 2016-03-11 12:44:26 +01:00
rallytime
de0cc97a51 Add code-block:: bash declarations 2016-03-10 21:14:19 -07:00
rallytime
cf0b2df8e9 Make configuration docs easier to read 2016-03-10 20:59:40 -07:00
Nicole Thomas
8cf0b9eb3d Merge pull request #31810 from whiteinge/saltenv-jinja-var 
Fix outdated Jinja 'env' variable reference
 2016-03-10 20:52:21 -07:00
Seth House
cb72b19240 Fix outdated Jinja 'env' variable reference 2016-03-10 19:48:42 -07:00
Ch3LL
3c03d9bd57 add mac_defaults test 2016-03-10 16:34:18 -07:00
rallytime
02e67c44ee Update github module to be more user-friendly 
- Add/update configuration and function docs
- Add error messages when required settings are missing
- Make helper functions a little more DRY, with error messages
 2016-03-10 16:01:52 -07:00
Nicole Thomas
b628b5574e Merge pull request #31801 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-03-10 14:24:53 -07:00
Nicole Thomas
7fb2331ebc Merge pull request #31800 from rallytime/merge-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2016-03-10 13:49:53 -07:00
rallytime
fe7ff0ebfa Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/cloud/__init__.py
  - salt/returners/smtp_return.py
 2016-03-10 13:13:35 -07:00
rallytime
44c15f0b16 Merge branch '2015.5' into '2015.8' 
Conflicts:
  - salt/config.py
 2016-03-10 12:56:57 -07:00