valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-09 01:36:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
67,434 Commits 24 Branches 182 Tags 341 MiB
cc854f1464
Commit Graph

67434 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
fb530256f6 Merge pull request #32361 from cro/remove_sdb_exp_flag 
SDB is no longer experimental
 2016-04-05 10:10:23 -06:00
C. R. Oldham
3bbe284d89 Remove 'experimental' warning from SDB docs. 2016-04-05 09:42:34 -06:00
rallytime
8b47c205df Make sure hash_type is lowercase in master/minion config files 
Fixes #32354
 2016-04-05 09:30:07 -06:00
Michael Calmer
e32212ad53 Prevent metadata download when listing installed products 2016-04-05 13:23:17 +02:00
abednarik
4c72adc03a Better message when minion fail to start 
When minion fail to start due to issues related to log path, print a better message
to help fix it.

Fixes #32255.
 2016-04-04 19:39:36 -03:00
Nitin Madhok
42d7a54240 Check if profile key exists in vm_ dict 2016-04-04 18:31:47 -04:00
Ferbla
e2f0f16564 Fixed win_wua example documentation 2016-04-04 17:25:29 -05:00
Justin Anderson
306c74e82a Merge pull request #32342 from terminalmage/fix-buildpackage 
More buildpackage fixes
 2016-04-04 15:55:51 -06:00
Erik Johnson
fbbf5935aa Add missing spm manpage and bash_completion file 
Also remove duplicate entries for master/minion conf templates
 2016-04-04 16:53:56 -05:00
Erik Johnson
764af33faf Add salt.bash symlink 2016-04-04 16:53:56 -05:00
Erik Johnson
80f7c31d53 buildpackage.py: add salt.bash to SOURCES 2016-04-04 16:53:56 -05:00
Erik Johnson
969519b37e Remove unnecessary cd command 2016-04-04 16:53:56 -05:00
Mike Place
f423289422 Merge pull request #32338 from rallytime/clean-up-warning 
Clean up remaining file_ignore_glob type error warning
 2016-04-04 15:19:52 -06:00
Mike Place
e1ef4a9d66 Merge pull request #32336 from rallytime/bp-28639 
Back-port #28639 to 2015.8
 2016-04-04 14:53:11 -06:00
Mike Place
6ee5a9729c Merge pull request #32332 from rallytime/fix-32305 
Don't unsubscribe from open events on the CLI too early on long-running commands
 2016-04-04 14:39:39 -06:00
Mike Place
8578089beb Merge pull request #32339 from Ch3LL/fix_doc_multi-master 
remove reference to master_alive_check in 2015.5
 2016-04-04 14:39:24 -06:00
Mike Place
842b6c53c1 Merge pull request #32337 from rallytime/fix-32305-2016.3 
Pull #32332 to 2016.3 branch
 2016-04-04 14:35:14 -06:00
Erik Johnson
ead5c3d6bc Fix missing endif 2016-04-04 15:25:46 -05:00
C. R. Oldham
dafe279e60 Lint 2016-04-04 14:07:38 -06:00
Nicole Thomas
22b296d2fd Merge pull request #32333 from rallytime/merge-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2016-04-04 14:06:02 -06:00
Ch3LL
2774da288d remove reference to master_alive_check 2016-04-04 13:49:33 -06:00
C. R. Oldham
abc2de0119 More clarification. 2016-04-04 13:47:56 -06:00
rallytime
2f25870e46 Clean up remaining file_ignore_glob type error warning 2016-04-04 13:21:07 -06:00
rallytime
dbaa3c806c Don't unsubscribe from open events on the CLI too early on long-running commands 
Fixes #32305
 2016-04-04 13:10:32 -06:00
RuriRyan
0829143dd1 Fixed handling of the disabled option for yumpkg 
It wasn't possible do set enabled back to 1 via state files. So if you once disabled a repository you couldn't enable it again.

This line fixes all the weird behaviour in simply converting disabled=True/False to enabled=0/1 respectively.
 2016-04-04 12:57:13 -06:00
rallytime
d7b4b8b081 Merge branch '2015.5' into '2015.8' 
Conflicts:
  - doc/ref/configuration/master.rst
  - doc/ref/configuration/minion.rst
  - salt/config.py
 2016-04-04 12:36:14 -06:00
Mike Place
77f4a52ad3 Merge pull request #31611 from eliasp/2016.3-modules.nspawn-bootstrap_debian-releases 
Support more Debian releases
 2016-04-04 12:23:35 -06:00
rallytime
8dc1161c8a Don't unsubscribe from open events on the CLI too early on long-running commands 
Fixes #32305
 2016-04-04 12:15:53 -06:00
Mike Place
234a5c365c Merge pull request #32283 from jtand/user_preset_test_fix 
Changed /tmp/ to /home/ user.present test
 2016-04-04 12:02:08 -06:00
Mike Place
acf8aa23ee Merge pull request #32286 from twangboy/fix_mac_build 
Fix build scripts for Mac
 2016-04-04 12:01:51 -06:00
Mike Place
95bcdaa4bb Merge pull request #32287 from rallytime/reimplement-31172 
Reimplement #31172, which got removed in a merge-forward.
 2016-04-04 11:53:11 -06:00
Mike Place
28cc054244 Merge pull request #32289 from rallytime/fix-32246 
New salt-cloud instances should not use old hash_type default.
 2016-04-04 11:52:09 -06:00
Mike Place
5fb90a1040 Merge pull request #32291 from twangboy/fix_14277 
Fix bad output for chocolatey.version (fixes #14277)
 2016-04-04 11:50:54 -06:00
Mike Place
edbab99164 Merge pull request #32295 from rallytime/test-cloud-deploy-dir 
Test the contents of 'deploy_scripts_search_path' in salt.config.cloud_config
 2016-04-04 11:38:47 -06:00
Mike Place
f65cb384d5 Merge pull request #32307 from cro/proxy_sync_all 
Sync all modules at proxy startup in case the proxymodule needs other modules.
 2016-04-04 11:36:55 -06:00
Mike Place
bc5b5d4731 Merge pull request #32310 from jfindlay/parallels 
Parallels Desktop execution module
 2016-04-04 11:27:43 -06:00
Mike Place
4389680bc5 Merge pull request #32315 from ahus1/fix_file_managed_http_requests 
fixing file.managed with requests lib
 2016-04-04 11:20:11 -06:00
Mike Place
9065201761 Merge pull request #32316 from vutny/update-bootstrap-tutorial 
Update Salt Bootstrap tutorial
 2016-04-04 11:18:12 -06:00
Mike Place
352f3c01d1 Merge pull request #32325 from bdrung/fix-shebang 
Re-add shebang to ssh-id-wrapper shell script
 2016-04-04 11:08:41 -06:00
Mike Place
f16e332b3a Merge pull request #32326 from bdrung/fix-typos 
Fix typos
 2016-04-04 10:41:41 -06:00
Benjamin Drung
a7db152333 Fix typo dont -> don't 2016-04-04 14:56:29 +02:00
Benjamin Drung
d4c037301b Fix typo missmatch -> mismatch 2016-04-04 14:54:54 +02:00
Benjamin Drung
70dba70ff0 Fix typo additonal -> addition 2016-04-04 14:53:07 +02:00
Benjamin Drung
68c60903aa Fix typo mutliple -> multiple 2016-04-04 14:51:39 +02:00
Benjamin Drung
0f2c779b90 Fix typo fucntion -> function 2016-04-04 14:47:12 +02:00
Benjamin Drung
0c9e4c8c80 Fix typo avilable -> available 2016-04-04 14:46:13 +02:00
Benjamin Drung
920abe2ec7 Fix typo formated -> formatted 2016-04-04 14:45:20 +02:00
Benjamin Drung
e56dd4bb23 Fix typo ommitted -> omitted 2016-04-04 14:37:13 +02:00
Benjamin Drung
f99e6f1f13 Fix typo ouptut -> output 2016-04-04 14:35:41 +02:00
Benjamin Drung
d3804094f2 Fix typo wether -> whether 2016-04-04 14:34:09 +02:00