valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
26,747 Commits 24 Branches 182 Tags 341 MiB
cc8e25e316
Commit Graph

26747 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Boucha
359640b1cf Merge pull request #10729 from UtahDave/develop 
bump windows installer version number
 2014-02-25 09:59:45 -07:00
David Boucha
34a12d0929 bump windows installer version number 2014-02-25 09:58:34 -07:00
Thomas S Hatch
514b0d3a73 Revert "ZMQ topics" 
This reverts commit 83a725ffb0.

Conflicts:
	salt/exceptions.py
	salt/minion.py
 2014-02-25 09:54:09 -07:00
Pedro Algarvio
96849c526a Merge pull request #10724 from terminalmage/tests 
Add three tests for minion_id generation
 2014-02-25 09:23:59 +00:00
Erik Johnson
69ce44ed6f Add more get_id tests + some DRY fixes 2014-02-25 02:27:35 -06:00
Erik Johnson
a5633393c9 More concise fix for empty /etc/hosts line check 2014-02-25 02:04:35 -06:00
Pedro Algarvio
ce9f923190 Test is now fixed. 2014-02-25 01:59:49 -06:00
Pedro Algarvio
669561815f Run windows specific code on windows only! 2014-02-25 01:59:40 -06:00
Pedro Algarvio
284a2abfcb Get mock_open working. 
Kind of since we're not using `mock_open` from the mocked library. Were
actually using the recipe to mock the builtin open as seen on http://goo.gl/dxMwPO
 2014-02-25 01:59:30 -06:00
Pedro Algarvio
d697e51acb Merge pull request #10714 from terminalmage/fix-etc-hosts-parsing 
More concise fix for empty /etc/hosts line check
 2014-02-25 07:10:26 +00:00
Erik Johnson
474e7590b9 Add test for salt.config.get_id() when /etc/hosts is parsed 
This is a WIP, the mocking isn't quite working yet.
 2014-02-24 23:46:00 -06:00
Thomas S Hatch
2adbe06232 Don't die on ioflo import 2014-02-24 20:45:07 -07:00
ed lane
0b5a989bb5 rename map.py to diff.py, sort minions within a pool, more clear output format 2014-02-24 19:00:56 -07:00
Erik Johnson
6ad847aaa1 More concise fix for empty /etc/hosts line check 2014-02-24 19:55:19 -06:00
Thomas S Hatch
84d0f6ec73 Add raet_int to opts 2014-02-24 17:08:19 -07:00
Samuel Smith
469266fb36 Merge pull request #10713 from SmithSamuelM/sam_raet_11 
Sam raet 11
 2014-02-24 17:01:02 -07:00
Samuel M Smith
c0d5b4177e pep8 ify 2014-02-24 16:59:42 -07:00
Samuel M Smith
948423de1d Merge remote-tracking branch 'upstream/develop' into sam_raet_11 2014-02-24 16:56:30 -07:00
Thomas S Hatch
e2376698e0 Add more ioflo controls 2014-02-24 16:54:26 -07:00
Samuel M Smith
b8c5e9ff61 added test directory 2014-02-24 16:50:09 -07:00
Samuel M Smith
bb9047c028 Adding flo scripts 2014-02-24 16:49:41 -07:00
Samuel M Smith
29fd497e86 Starting to integrate ioflo daemons 2014-02-24 16:46:38 -07:00
Thomas S Hatch
5c0f6ffefa Add default floscript locations 2014-02-24 16:45:49 -07:00
Thomas S Hatch
7d1ae66f07 Converge on transport instead of salt_transport 2014-02-24 16:37:11 -07:00
Thomas S Hatch
cc8c4a8fe7 Add initial hook to load in the ioflo master and minion daemons 2014-02-24 16:34:22 -07:00
Samuel Smith
c91e842064 Merge pull request #10711 from SmithSamuelM/sam_raet_10 
Sam raet 10
 2014-02-24 16:03:19 -07:00
Samuel M Smith
f466161fa0 Merge remote-tracking branch 'upstream/develop' into sam_raet_10 2014-02-24 16:02:11 -07:00
Samuel M Smith
625d138b15 Fixes to basic floscript for raet 2014-02-24 16:00:58 -07:00
Matthew Williams
f17c6c694c postgres_users: report changes when user is created 2014-02-24 17:09:37 -05:00
Olivier Trempe
28d3ecc261 lint fixes 2014-02-24 16:59:07 -05:00
Thomas S Hatch
d914c96d71 Merge pull request #10374 from jacksontj/pubfilter 
More granular master job targeting
 2014-02-24 13:57:22 -08:00
Samuel M Smith
bc5d61c476 Basic ioflo raet demo working 2014-02-24 14:56:22 -07:00
Thomas S Hatch
205f17236b Merge pull request #10706 from terminalmage/docs 
Clean up img module docs
 2014-02-24 13:54:00 -08:00
Thomas S Hatch
09a8a1e015 Merge pull request #10703 from terminalmage/new-module-busywork 
New module busywork
 2014-02-24 13:52:59 -08:00
Olivier Trempe
7324cf0bc5 Add option in reg state and module to disable reflection on Windows 64-bit. 2014-02-24 16:41:26 -05:00
Joseph Hall
6cb226a510 Merge pull request #10707 from AnneTheAgile/9356-Doc-UseIamForPrivKeyShare 
#9356 Add cite to IAM for EC2 credential sharing.
 2014-02-24 14:35:52 -07:00
AnneTheAgile
78bc296ec0 #9356 Add cite to IAM for EC2 credential sharing. 2014-02-24 16:28:28 -05:00
Erik Johnson
e720b57fcf Merge pull request #10701 from rallytime/mac_user_test 
Wrote more mac_user tests, found and fixed bug
 2014-02-24 15:22:17 -06:00
Joseph Hall
eca15314f7 Merge pull request #10704 from pakdel/win_bootstrap_on_slow_machines 
Wait for winexesvc b4 trying to bootstrap
 2014-02-24 13:54:49 -07:00
Joseph Hall
71e68d3eab Merge pull request #10705 from s0undt3ch/hotfix/lint 
Lint Fixes
 2014-02-24 13:13:50 -07:00
Pedro Algarvio
bdcf244155 __states__ is also a Salt global variable 2014-02-24 20:11:59 +00:00
Erik Johnson
7f0971c2b3 Hide aliased function name 2014-02-24 14:11:54 -06:00
Erik Johnson
6765529fc8 fix CLI example 2014-02-24 14:10:12 -06:00
Pedro Algarvio
0faf49a31f Remove trailing white-space 2014-02-24 20:10:02 +00:00
Pedro Algarvio
29bb1232ff White-space lint fixes 2014-02-24 20:09:16 +00:00
Amir Pakdel
e7393104bc Wait for winexesvc b4 trying to bootstrap 
On slow win machines, there might be a short delay
between the time port 445 is reachable and when winexe
can connect to the server. This causes Salt-Minion
bootstrap fail on slow Win machines.
 2014-02-24 15:08:37 -05:00
Joseph Hall
b79b49a5b7 Merge pull request #10685 from bretep/optimize_providers 
Optimize salt-cloud providers when map_providers_parallel is called.
 2014-02-24 13:07:22 -07:00
Erik Johnson
775db263eb Add znc module to modules toctree 2014-02-24 13:58:54 -06:00
Erik Johnson
283a1faba1 add automodule file for new znc module 2014-02-24 13:58:44 -06:00
Erik Johnson
89dd37fb99 Add versionadded directive for new znc module 2014-02-24 13:56:24 -06:00