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
71,471 Commits 24 Branches 182 Tags 341 MiB
b9be6521db
Commit Graph

71471 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Radman
b9be6521db Preserve trailing lines in crontab 
This allows cron.file to install a crontab file that contains trailing
newlines. Previously a change may have been detected on every run.
 2016-07-22 12:18:08 -04:00
Mike Place
166d5483ac Merge pull request #34853 from rallytime/merge-develop 
[develop] Merge forward from 2016.3 to develop
 2016-07-21 13:14:47 -06:00
rallytime
1a9d6eee15 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/grains/core.py
  - salt/state.py
  - tests/unit/grains/core_test.py
 2016-07-21 12:06:25 -06:00
Mike Place
caef413e59 Merge pull request #34849 from thatch45/saltfiledoc 
Add a clarifying note on Saltfile
 2016-07-21 11:52:43 -06:00
Mike Place
b3d8143d36 Merge pull request #34852 from rallytime/skip-gce-tests 
Skip GCE unit tests - causes test suite to hang
 2016-07-21 11:52:31 -06:00
Nicole Thomas
7423177491 Update 2016.3.2 release notes (#34850) 2016-07-21 11:18:31 -06:00
Mike Place
650674d14a Merge pull request #34844 from vutny/fix-grains-load-in-config-init 
Fix getting total available memory without `psutil` installed
 2016-07-21 11:12:37 -06:00
Thomas S Hatch
94df6f8dc6 Add a clarifying note on Saltfile 2016-07-21 11:09:28 -06:00
rallytime
15b4f5a8b3 Skip GCE unit tests - causes test suite to hang 2016-07-21 10:53:00 -06:00
Nicole Thomas
59fffa86bc Update release notes for 2016.3.2 (#34848) 2016-07-21 10:02:01 -06:00
Mike Place
4fdf40cf3e Merge pull request #34830 from sjorge/develop-vmadm-runner 
vmadm runner cleanup and retest
 2016-07-21 08:43:39 -06:00
Mike Place
3849a51b54 Merge pull request #34832 from techhat/systemdrunning 
List running systemd services
 2016-07-21 08:41:52 -06:00
Mike Place
52a95b2ea3 Merge pull request #34837 from thatch45/34345 
Fix #34345
 2016-07-21 08:36:15 -06:00
Mike Place
96450ac74d Merge pull request #34838 from thatch45/unless_valid 
Check if a valid value is passed to unlyif/unless
 2016-07-21 08:34:29 -06:00
Mike Place
3a5ef86d58 Merge pull request #34840 from thatch45/state_update_ssh 
update the state wrapper to include show_low_sls
 2016-07-21 08:34:02 -06:00
Mike Place
5f67318fd7 Merge pull request #34842 from sjorge/2016.3-zpool-simplifaction 
2016.3 zpool cleanup and fixes
 2016-07-21 08:32:55 -06:00
Denys Havrysh
4dc7827020 Fix comment in master config, prevents the service from starting 2016-07-21 15:43:48 +03:00
Denys Havrysh
b4cfebb107 Fix Salt failure after merge of #34683 2016-07-21 15:03:54 +03:00
Jorge Schrauwen
a7ff9524b0 drop parsing of vdevs, error passthrough from zpool cli 2016-07-21 01:07:20 +02:00
Jorge Schrauwen
25d6c8139b eliminate hardcoded vdev type from zpool state 2016-07-21 00:53:45 +02:00
Thomas S Hatch
77dce3920c update the state wrapper to include show_low_sls 2016-07-20 16:40:13 -06:00
Jorge Schrauwen
47b8dc946c salt.states.zpool - work with updates exec module 2016-07-21 00:38:35 +02:00
Jorge Schrauwen
a5a98845c7 salt.module.zpool - fix bug with properties on/off being parsed as true/false 2016-07-21 00:28:23 +02:00
Thomas S Hatch
1f34299a84 Check if a valid value is passed to unlyif/unless 2016-07-20 16:20:58 -06:00
Thomas S Hatch
1e8c585cd3 Fix #34345 2016-07-20 15:55:18 -06:00
Jorge Schrauwen
dd64494a19 salt.modules.zpool - drop vdev types to make it more future proof, fallback to zpool cli error messages 2016-07-20 23:43:47 +02:00
Thomas S Hatch
7bda166e9d keep this beacon from stack tracing at the loader (#34825) 2016-07-20 14:55:22 -06:00
Joseph Hall
fe35181130 List running systemd services 2016-07-20 14:54:49 -06:00
Nicole Thomas
b9db0b0036 Merge pull request #34824 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-07-20 14:54:35 -06:00
Jorge Schrauwen
1684417cda vmadm runner cleanup and retest 2016-07-20 22:26:11 +02:00
Mike Place
b55b5ea964 Don't open file in binary mode when reading network (#34819) 
Corrects stacktraces in py3 compat.
 2016-07-20 12:38:03 -06:00
rallytime
094731f4b6 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-07-20 12:32:08 -06:00
Mike Place
98fa4a404e Merge pull request #34818 from jtand/mysql_state_integration_test_cleanup 
Skip mysql state test if mysqladmin is not available
 2016-07-20 10:10:35 -06:00
Justin Anderson
9abb6f91bb Skip mysql state test if mysqladmin is not available 2016-07-20 09:24:24 -06:00
Mike Place
2dc02cbb0d Merge pull request #34792 from mollykreis/dev/mkreis/win_timezone_compatibility 
win_timezone: Make timezones on Windows more compatibile with Linux
 2016-07-20 08:52:11 -06:00
Mike Place
62ef8fdb35 Merge pull request #34670 from isbm/isbm-osmajorrelease-grain-suse 
Add "osmajorrelease" grain (2016.3)
 2016-07-20 08:39:38 -06:00
Mike Place
e30b324394 Merge pull request #34576 from eidng8/develop 
#28085
 2016-07-20 08:38:01 -06:00
Mike Place
aff29906fc Merge pull request #34671 from isbm/isbm-osmajorrelease-grain-suse-devel 
Add "osmajorrelease" grain
 2016-07-20 08:35:34 -06:00
Mike Place
b986c35a88 Merge pull request #34794 from rallytime/reneable-pam-test 
Renable the pam execution module unit test
 2016-07-20 08:05:50 -06:00
Mike Place
2f27718e8a Merge pull request #34809 from rbjorklin/file-copy-dir 
Made file.copy work for directories
 2016-07-20 08:05:10 -06:00
Mike Place
4253830f9c Merge pull request #34812 from cachedout/remove_file_test 
Remove test for file dir behavior
 2016-07-20 08:04:57 -06:00
Mike Place
b7fe952427 Remove test for file dir behavior 
Refs #34809
 2016-07-20 08:04:00 -06:00
Mike Place
6ca9ffa7c7 Merge pull request #34683 from cachedout/issue_34215 
Fix publisher leak
 2016-07-20 07:57:10 -06:00
Mike Place
6636f2b449 Merge pull request #34803 from junovitch/issue_24744 
salt/state.py: set `chunk['order'] = 0' with `order: first'; fixes #24744
 2016-07-20 07:56:20 -06:00
Mike Place
55e34656fd Merge pull request #34808 from DSRCompany/issues/34268_fixup 
Fix problem when no acl configured
 2016-07-20 07:53:20 -06:00
Bo Maryniuk
a6bcbd615f Lintfix PEP8: E262 2016-07-20 15:26:18 +02:00
Robin Björklin
aead8a9ae4 Made file.copy work for directories 2016-07-20 11:09:58 +02:00
Dmitry Kuzmenko
0dd0740857 Fix problem when no acl configured 2016-07-20 10:43:57 +03:00
Jason Unovitch
64c850410f salt/state.py: set chunk['order'] = 0' with order: first'; fixes #24744 
Currently the `order: first' keyword executes later states without order
options. Consider a test case such as:

```SaltStack
sleep 1:
  cmd.run:
    - order: first
sleep 2:
  cmd.run
sleep 3:
  cmd.run
sleep 4:
  cmd.run:
    - order: last
```

The contents of each chunk dictionary at runtime show that the 'first' state
is not evaluated to 'first'.

{'name': 'sleep 4', 'state': 'cmd', '__id__': 'sleep 4', 'fun': 'run', '__env__': 'base', '__sls__': u'test', 'order': 1010100}
{'name': 'sleep 2', 'state': 'cmd', '__id__': 'sleep 2', 'fun': 'run', '__env__': 'base', '__sls__': u'test', 'order': 10000}
{'name': 'sleep 3', 'state': 'cmd', '__id__': 'sleep 3', 'fun': 'run', '__env__': 'base', '__sls__': u'test', 'order': 10001}
{'name': 'sleep 1', 'state': 'cmd', '__id__': 'sleep 1', 'fun': 'run', '__env__': 'base', '__sls__': u'test', 'order': 10100}
 2016-07-19 21:17:40 -04:00
Mike Place
cb1a0866c7 Merge pull request #34797 from cachedout/comment_vmadm_runner 
Comment out localclient in vdadm runner
 2016-07-19 17:01:24 -06:00