valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
35,012 Commits 24 Branches 182 Tags 341 MiB
267704cd45
Commit Graph

35012 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Erik Johnson
37124b91e1 Merge pull request #14676 from rallytime/fix_str_format 
Fixes #14559
 2014-07-31 22:02:37 -05:00
rallytime
9e66bf1e72 Fixes #14559 2014-07-31 17:48:28 -06:00
rallytime
7c6d15eca2 Fixes #14555 
Fixed plylint error in `salt.utils.schedule.py`
 2014-07-31 17:22:42 -06:00
Colton Myers
9460b5b165 Deprecate the prep_install option for seed.apply_ 2014-07-31 17:12:19 -06:00
Erik Johnson
65a655d2f2 Merge branch 'pyobjects-rel-note' into 2014.7 2014-07-31 18:07:20 -05:00
Evan Borgstrom
c892cfad8a Adding Pyobjects section to the release notes for 2014.7.0 2014-07-31 18:06:05 -05:00
Erik Johnson
b454e39953 Merge pull request #14663 from borgstrom/pyobjects-rel-note 
Adding Pyobjects section to the release notes for 2014.7.0
 2014-07-31 18:02:21 -05:00
Colton Myers
2f2d05b6c9 Merge pull request #14669 from rallytime/pylint_fix_develop 
Fix pylint errors
 2014-07-31 16:45:30 -06:00
Colton Myers
2bfcbe01d0 Merge pull request #14661 from rallytime/fix_rhel7_test 
Add GPG key file to integration tests
 2014-07-31 16:34:47 -06:00
Colton Myers
2484db8795 Merge pull request #14665 from rallytime/fix_augeas_import 
Fixed augeas import
 2014-07-31 16:31:33 -06:00
Colton Myers
4ce4fef541 Merge branch '2014.7' into develop 2014-07-31 16:27:28 -06:00
Colton Myers
0fec4db458 Backport #14488 to 2014.7 2014-07-31 16:27:14 -06:00
Nitin Madhok
140aea74a1 Change the error message to show actually what's tested 2014-07-31 16:25:29 -06:00
Nitin Madhok
2aec676bd8 Removing trailing whitespace 2014-07-31 16:25:29 -06:00
Nitin Madhok
722e9e8e6c Making note in docs and changing example 2014-07-31 16:25:29 -06:00
Nitin Madhok
6548ce2562 Appending trailing slash if not present 2014-07-31 16:25:29 -06:00
Nitin Madhok
b5e16abcd0 Testing abspath instead of normpath 2014-07-31 16:25:28 -06:00
Nitin Madhok
253f6da7b9 Fixing it to append a trailing slash in end 2014-07-31 16:25:28 -06:00
Colton Myers
270ab17445 Merge branch '2014.7' into develop 2014-07-31 16:21:27 -06:00
Colton Myers
41c90dbca5 Backport #14486 to 2014.7 2014-07-31 16:21:12 -06:00
Scott Walton
f3430495ac Format the tags before calling set_user_tags to match the single argument format passed through the command line 2014-07-31 16:20:49 -06:00
Scott Walton
a809f9cf07 Convert the new tag list into a string to prevent the TypeError #14484 2014-07-31 16:20:49 -06:00
Colton Myers
21052678aa Merge branch '2014.7' into develop 2014-07-31 16:14:58 -06:00
Colton Myers
c47b02c293 Backport #14625 to 2014.7 2014-07-31 16:14:30 -06:00
John Anderson
049210cd93 Previsouly this would run even if no proc matched. 2014-07-31 16:14:16 -06:00
Colton Myers
6a9966beb8 Merge branch '2014.7' into develop 2014-07-31 16:13:29 -06:00
Colton Myers
9a02306c7e Backport #14620 2014-07-31 16:13:11 -06:00
John Anderson
1dc8248b23 remove unused import 2014-07-31 16:13:01 -06:00
John Anderson
4735b858fb Handle no roster file gracefully 2014-07-31 16:13:01 -06:00
Colton Myers
a8804e4514 Merge branch '2014.7' into develop 
Conflicts:
	salt/roster/__init__.py
	salt/roster/ansible.py
 2014-07-31 16:07:38 -06:00
Colton Myers
91bdf92304 Backport #14448 to 2014.7 2014-07-31 16:04:18 -06:00
Daniel Wallace
3d113ed548 fix error templating when using an ansible inventory script 2014-07-31 16:04:05 -06:00
Daniel Wallace
2957a482c8 clean up pylint errors 2014-07-31 16:04:05 -06:00
Daniel Wallace
cd438ed47b add extra error catcher 2014-07-31 16:04:05 -06:00
Daniel Wallace
c4f5803e47 document ansible roster 2014-07-31 16:04:05 -06:00
Daniel Wallace
f1261343f4 clean up and add some minor logging 
make --roster-file work with the ansible roster
 2014-07-31 16:04:05 -06:00
Daniel Wallace
ecaf3e7716 document functions for ansible roster 2014-07-31 16:04:05 -06:00
Daniel Wallace
1458767dde use targets like flat.py 2014-07-31 16:04:05 -06:00
Daniel Wallace
8cf0a56bcb add executable ansible hosts files 2014-07-31 16:04:05 -06:00
Daniel Wallace
f4d7312d71 implement children nodegroups 2014-07-31 16:04:04 -06:00
Daniel Wallace
8c4d2d6f57 clean up matching 2014-07-31 16:04:04 -06:00
Daniel Wallace
075d5b6386 Use loader instead of variables 2014-07-31 16:04:04 -06:00
Daniel Wallace
4d3f2fe0ad should be a dictionary not a list 2014-07-31 16:04:04 -06:00
Daniel Wallace
ad3e975bde begin ansible roster 2014-07-31 16:04:04 -06:00
Colton Myers
e74ac57c27 Merge branch '2014.7' into develop 2014-07-31 16:02:25 -06:00
Colton Myers
8a7b7905f2 Backport #14439 to 2014.7 2014-07-31 16:01:55 -06:00
Gareth J. Greenaway
91d8a0a04f Fixing a weird case where an empty job file will end up in the cachedir, causing exceptions when the minion is restarted. This change removed the problem job file. 2014-07-31 16:01:28 -06:00
Colton Myers
78adf2eebe Merge branch '2014.7' into develop 2014-07-31 15:35:14 -06:00
Colton Myers
2bff445dfc Backport #14428 to 2014.7 2014-07-31 15:34:53 -06:00
Marion Duprey
a4fd460d92 fix rbenv module UnboundLocalError 2014-07-31 15:34:41 -06:00