Commit Graph

61748 Commits

Author SHA1 Message Date
Mike Place
bb033c238d Merge pull request #32343 from Ferbla/2015.8
Fixed win_wua example documentation
2016-04-05 10:14:36 -06:00
Mike Place
3219a8d176 Merge pull request #32360 from rallytime/fix-32354
Make sure hash_type is lowercase in master/minion config files
2016-04-05 10:10:46 -06:00
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
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
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
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
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
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
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
Benjamin Drung
538fb6fae2 Fix typo perfomed -> performed 2016-04-04 14:33:06 +02:00
Benjamin Drung
db7af998ee Fix typo santized -> sanitized 2016-04-04 14:30:28 +02:00
Benjamin Drung
d7af01da2b Fix typo coresponding -> corresponding 2016-04-04 14:29:20 +02:00
Benjamin Drung
301e78b5be Fix typo vaules -> values 2016-04-04 14:28:35 +02:00
Benjamin Drung
8cada9573f Fix typos of retrieve 2016-04-04 14:27:41 +02:00
Benjamin Drung
b484d6f9c9 Fix typo directorys -> directories 2016-04-04 14:20:39 +02:00
Benjamin Drung
ffe585f078 Re-add shebang to ssh-id-wrapper shell script
Commit 0b286f1bc3 removed the shebang line
from the shell script ssh-id-wrapper without reasoning. This script is
executable and needs a shebang for calling it directly. Thus re-add it.
2016-04-04 13:11:03 +02:00
Michael Calmer
cb1f30ee10 fix sorting by latest version when called with an attribute 2016-04-04 10:34:13 +02:00
Alexander Schwartz
a867d23383 ensure streaming mode (use for example by file.managed) will works for requests backend 2016-04-02 20:32:33 +00:00
Denys Havrysh
b9698f015d Update Salt Bootstrap tutorial 2016-04-02 17:06:44 +03:00
Erik Johnson
fbdc47cc55 Merge pull request #32284 from rallytime/config-audit
Audit config.py default types and values
2016-04-01 21:00:38 -05:00
rallytime
0491513204 Don't be so explicit. Just use string_types. 2016-04-01 17:12:39 -06:00
Nicole Thomas
0a6d44e57b Merge pull request #32302 from terminalmage/fix-missing-release
Properly support packages with blank "Release" param in pkg.latest_version
2016-04-01 16:13:27 -06:00
rallytime
083c477fd3 Use six.string_types in config default tuples 2016-04-01 16:09:57 -06:00