valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
33,060 Commits 24 Branches 182 Tags 341 MiB
a46d44694f
Commit Graph

33060 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nicolas Delaby
4e7e0bc7e0 Since #13463 support for previous version of docker-py older than 0.3.2 is broken 
Reflect this change in documentation
 2014-06-24 22:28:10 +02:00
Nicolas Delaby
55afbfa188 Fix typo 2014-06-24 22:28:10 +02:00
Thomas S Hatch
46ce5cd310 libnacl settled on taking a path in the new save method of keys 2014-06-24 14:09:36 -06:00
C. R. Oldham
fbfd19c682 fix ext_nodes breakage 2014-06-24 13:58:53 -06:00
Thomas S Hatch
7998d914ca Fix key gen, earlier commit reffed wrong gen_keys method 2014-06-24 13:46:10 -06:00
Arnold Bechtoldt
da953f2220 chmod ssh known hosts file 2014-06-24 21:30:13 +02:00
Thomas S Hatch
1a4b13ea8b Merge pull request #13682 from Tweenagedream/states-file-rename-copy-makedirs-fix 
copy and rename should pass name instead of dname when makedirs is true
 2014-06-24 12:49:17 -06:00
TweenageDream
ebeb9ba2b5 copy and rename should pass name instead of dname when makedirs is true 2014-06-24 14:42:26 -04:00
Thomas S Hatch
dbd6541cb9 Genericize key generation for raet/zeromq 2014-06-24 12:26:17 -06:00
Thomas S Hatch
6ae33a4d06 Here you go @mgwilliams, I have not tested this!! 
But it should not cause any problems, please test it and fix it up!
 2014-06-24 12:09:46 -06:00
Thomas S Hatch
432ea22e03 Make salt-key create the right key dirs 2014-06-24 11:57:27 -06:00
Gareth J. Greenaway
812975fe7d Adding state docstring to the state_doc function output. 2014-06-24 10:56:08 -07:00
Colton Myers
4ea4995388 Merge pull request #13676 from basepi/cherrypick 
Do not unnecessarily recompile OpenVZ envId pattern
 2014-06-24 11:49:33 -06:00
Pedro Algarvio
86a86bb1ec Merge pull request #13678 from rallytime/cloud_config_tests 
More cloud config unit tests
 2014-06-24 18:45:13 +01:00
Thomas S Hatch
8c6de2b3f9 linting fix 2014-06-24 11:27:51 -06:00
rallytime
67e65b237d More cloud config unit tests 2014-06-24 10:59:46 -06:00
Wolodja Wentland
75f0ffd946 Do not unnecessarily recompile OpenVZ envId pattern 
The pattern against which lines in /proc/self/status are matched is static and
therefore does not have to be (re-)compiled for every line in the file.
 2014-06-24 10:30:25 -06:00
Joseph Hall
6be051f07f Merge pull request #13675 from nmadhok/fix-doc-states-file 
Fixing the doc for salt.states.file - Fixes #13674
 2014-06-24 10:26:18 -06:00
Nitin Madhok
17df66208b Fixing the doc and escaping newline char 2014-06-24 12:10:54 -04:00
Wolodja Wentland
837ca58bcf Revert "Add master local ip mapping to minion id checking" 
This reverts commit 1f890ea959.

Fixes #13665

Conflicts:
	salt/utils/minions.py
 2014-06-24 13:38:19 +02:00
Thomas S Hatch
09614030c3 Bah! overcomplicated it inline :) 2014-06-23 20:06:50 -06:00
Thomas S Hatch
f8b383ea84 Add initial listener support to state runtime 2014-06-23 19:56:11 -06:00
Joseph Hall
6f47d10c05 Merge pull request #13661 from gtmanfred/develop 
Document match for overstates
 2014-06-23 18:33:57 -06:00
Daniel Wallace
4d8d2fa377 Document match for overstates 
Uses compound matching. Closes #13659
 2014-06-23 19:19:47 -05:00
Samuel Smith
c86d3c5cce Merge pull request #13660 from SmithSamuelM/sam_raet_47 
Enabled framer manager that runs keep alive transactions initiated by minion
 2014-06-23 17:58:54 -06:00
Samuel M Smith
1ace8ba719 Merge remote-tracking branch 'upstream/develop' into sam_raet_47 2014-06-23 17:54:06 -06:00
Samuel M Smith
d3183d58a0 enabled framer manger in minion.flo so minion initiates keep alive transactions 2014-06-23 17:52:32 -06:00
Samuel M Smith
066bf4d7c4 Added comments of where to modify behavior for presence support in RAET 2014-06-23 17:45:59 -06:00
Thomas S Hatch
ee291c382d Merge pull request #11784 from obimod/patch-1 
Prevent a keyerror when cloud mapping
 2014-06-23 17:10:36 -06:00
Thomas S Hatch
fb8d6e575f Merge pull request #13645 from garethgreenaway/schedule_state 
Updates to schedule.py module and initial work to add a state to manage scheduled jobs
 2014-06-23 17:05:05 -06:00
Joseph Hall
93f559def2 Merge pull request #13656 from rallytime/cloud_config_tests 
More cloud profile config tests
 2014-06-23 15:22:56 -06:00
rallytime
f821ccaa88 More cloud profile config tests 2014-06-23 15:19:11 -06:00
Thomas S Hatch
1b6dae128e Merge pull request #13651 from spsoit/fixes_states_git_config_first_call 
Fixes exception in states.git.config()
 2014-06-23 15:15:49 -06:00
Joseph Hall
91e501bc45 Merge pull request #13655 from terminalmage/update-shar-script 
Add additional information to the comments for the shar script
 2014-06-23 15:06:49 -06:00
Erik Johnson
aa9ae49129 Add additional information to the comments for the shar script 2014-06-23 16:00:19 -05:00
Gareth J. Greenaway
c95452ba2f fixing docstrings. 2014-06-23 13:42:36 -07:00
Gareth J. Greenaway
60fdd15233 lint fixes 2014-06-23 13:42:36 -07:00
Gareth J. Greenaway
221b2706d1 Changes to schedule.modify to show a diff of what has changes when a scheduled job is updated. Also some cleanup of duplicated code between add and modify, now moved into a common build_schedule_item function. Some additional cleanup and the initial work on a state to manage scheduled jobs. 2014-06-23 13:42:35 -07:00
Joseph Hall
fa2c1f5eef Merge pull request #13653 from rallytime/cloud_config_tests 
One more cloud config unit test
 2014-06-23 12:30:28 -06:00
rallytime
d9f53a37f9 One more cloud config unit test 2014-06-23 12:17:26 -06:00
Joseph Hall
b46f08cc21 Merge pull request #13652 from sbellem/help-docs 
Corrected tiny typo
 2014-06-23 12:14:16 -06:00
Sylvain Bellemare
4260fab3be Corrected tiny typo 2014-06-23 20:09:01 +02:00
Joseph Hall
edb7fb22c4 Merge pull request #13650 from holmboe/patch-2 
Reflect the latest released version
 2014-06-23 12:08:53 -06:00
Henrik Holmboe
e0a6a5a13e Reflect the latest released version 
I did this exact PR in #12695 the last time around. Luckily #12720 seems to take a stab at automating this. :)
 2014-06-23 19:56:39 +02:00
Chad Heuschober
77836a173a Fixes exception that fires when config_get() is called and user has no .gitconfig 2014-06-23 13:55:26 -04:00
Thomas S Hatch
3bfa509fea Merge pull request #13649 from nlm/develop 
fixes potential ext_pillar line mismatches
 2014-06-23 11:55:23 -06:00
Thomas S Hatch
6602e33d9d Merge pull request #13641 from terminalmage/docs 
Clarify that templates are used on managed files
 2014-06-23 11:39:09 -06:00
Thomas S Hatch
c5a656dbc2 Merge pull request #13636 from makinacorpus/f1 
VT support for buildout mods
 2014-06-23 11:38:41 -06:00
Thomas S Hatch
d5e75db0c7 Merge pull request #13634 from victorlin/docker-network-mode 
Docker network mode
 2014-06-23 11:38:08 -06:00
Nicolas Limage
78b6550f9b fixes potential ext_pillar line mismatches 2014-06-23 18:26:53 +02:00