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
34,876 Commits 24 Branches 182 Tags 341 MiB
0ce353ddfb
Commit Graph

34876 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas Jackson
0ce353ddfb Add master_id to master docs 2014-08-01 16:38:22 -07:00
Thomas Jackson
abc9985e50 Pep8 cleanup 2014-08-01 16:38:00 -07:00
Thomas Jackson
5754314d67 Make backoff use acceptance_wait_time 2014-08-01 16:38:00 -07:00
Thomas Jackson
081708e3d6 More code cleanup, wrap all the calls to syndics in _call_syndic 2014-08-01 16:38:00 -07:00
Thomas Jackson
ccca1f1bb5 Add hard coded timeout for syndic being dead 2014-08-01 16:38:00 -07:00
Thomas Jackson
c8961fe792 Major re-work to look more like MultiMinion 2014-08-01 16:37:59 -07:00
Thomas Jackson
72a1287493 pep8 2014-08-01 16:37:59 -07:00
Thomas Jackson
d9d45dd0b8 Update notes 2014-08-01 16:37:59 -07:00
Thomas Jackson
6805d2b2cf Handle failures of upstream masters 2014-08-01 16:37:59 -07:00
Thomas Jackson
f226809cd5 Basics working, can't handle restart of a master yet... 2014-08-01 16:37:59 -07:00
Thomas Jackson
2b8c106108 Add master_id to pub/ret data as ground work for multi_syndic 2014-08-01 16:37:59 -07:00
Pedro Algarvio
d971892556 Merge pull request #14680 from techhat/genshi 
Add Genshi template rendering
 2014-08-02 00:18:14 +01:00
Colton Myers
ac8ce788c2 Merge branch '2014.7' into develop 2014-08-01 16:10:50 -06:00
Colton Myers
35ca1b890e Backport #14684 to 2014.7 2014-08-01 16:10:22 -06:00
Joseph Hall
bcdc5ce5bb Add filter type to state_output 2014-08-01 16:09:25 -06:00
Colton Myers
ed0421d87d Merge pull request #14684 from techhat/outputfilter 
Add filter type to state_output
 2014-08-01 16:08:24 -06:00
Joseph Hall
c6718d0200 Oof, forgot to clean up copy/paste 2014-08-01 13:50:54 -06:00
Pedro Algarvio
1f962f4691 Merge branch '2014.7' into develop 2014-08-01 20:19:10 +01:00
Pedro Algarvio
ecc9ce4f35 sdist must also generate and include salt/_version.py 2014-08-01 20:18:01 +01:00
Colton Myers
0143275458 Merge branch '2014.7' into develop 2014-08-01 12:36:57 -06:00
Colton Myers
051e371fe8 Add release notes for 2014.1.10 2014-08-01 12:36:10 -06:00
Colton Myers
0307fdbe9a Merge branch '2014.7' into develop 
Conflicts:
	salt/runners/manage.py
 2014-08-01 10:52:52 -06:00
Colton Myers
114d9a3489 Backport #14674 to 2014.7 2014-08-01 10:52:12 -06:00
Colton Myers
a2ae8f9217 Deprecate the prep_install option for seed.apply_ 2014-08-01 10:52:03 -06:00
Joseph Hall
96acb97780 Add filter type to state_output 2014-08-01 07:22:47 -06:00
Joseph Hall
80e5d8e60f Add Genshi template rendering 2014-08-01 04:11:42 -06:00
Joseph Hall
88c1d37598 Merge pull request #14678 from hvnsweeting/fix-doc-halite 
fix link scheme, default scheme is HTTPS, as used sample configs
 2014-08-01 03:01:38 -06:00
Hung Nguyen Viet
415623a9c6 fix link scheme, default scheme is HTTPS, as used sample configs 
provided by the tut
 2014-08-01 15:56:58 +07:00
Joseph Hall
61dffacc20 Merge pull request #14675 from rallytime/pylint_fix 
Fixes #14555
 2014-07-31 23:18:43 -06:00
rallytime
92e802040f Remove extra line to fix manage.py pylint error 2014-07-31 22:56:20 -06:00
Nicole Thomas
a4d5cd9602 Merge pull request #14674 from basepi/seedlint 
Deprecate the prep_install option for seed.apply_
 2014-07-31 22:42:10 -06:00
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