valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
67,199 Commits 24 Branches 182 Tags 341 MiB
1fa7c021b3
Commit Graph

67199 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rallytime
1fa7c021b3 Add pgjsonb_queue to queue doc index 2016-04-08 09:08:17 -06:00
Nicole Thomas
c712fbed37 Merge pull request #32419 from jtand/file_state_test_fix 
Fixes test failure where Fedora 23 has /etc/grub.conf by default
 2016-04-07 16:15:51 -06:00
Justin Anderson
28ea60f28e Fixes test failure where Fedora 23 has /etc/grub.conf by default 2016-04-07 11:40:12 -06:00
Erik Johnson
005825a30e Merge pull request #32416 from jtand/salt_spec_fix 
Updated salt.spec bash_completion
 2016-04-07 11:17:19 -05:00
Justin Findlay
b27ccc424b update release candidate testing doc (#32414) 2016-04-07 09:41:46 -06:00
Justin Anderson
65614b7f0f Updated salt.spec bash_completion 2016-04-07 09:16:47 -06:00
Mike Place
8c30b364ed Merge pull request #32379 from sangoma/v2016.3/fix-key-fingerall 
Fix Key.finger_all() method to actually consider all keys
 2016-04-06 12:44:21 -06:00
Nicole Thomas
584175f0ea Merge pull request #32371 from rallytime/bp-31646 
Back-port #31646 to 2016.3
 2016-04-06 09:17:51 -06:00
Moises Silva
c0f42f608c Fix Key.finger_all() method to actually consider all keys 
Use all_keys() instead of list_keys() to consider also local keys

Fix issue #32377
 2016-04-06 01:49:10 -04:00
Nicole Thomas
b9d1138bd7 Merge pull request #32367 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-04-05 16:01:51 -06:00
root
482f482ae6 Fixes #31645. Replaced pillar.item with pillar.get. 2016-04-05 15:43:56 -06:00
rallytime
760f479424 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/cli/daemons.py
  - salt/config/__init__.py
  - salt/scripts.py
  - salt/state.py
  - tests/unit/config/config_test.py
 2016-04-05 15:09:27 -06:00
Nicole Thomas
097aa7ccfc Merge pull request #32126 from cro/outputter_terse_docs 
Add a couple CLI examples for the highstate outputter.
 2016-04-05 11:23:29 -06:00
Mike Place
eab3b99be2 Merge pull request #32353 from mcalmer/prevent-refresh-on-list-installed-products 
Prevent metadata download when listing installed products
 2016-04-05 11:02:15 -06:00
Mike Place
64abec94e7 Merge pull request #32321 from abednarik/minion_start_fail_log 
Better message when minion fail to start
 2016-04-05 10:28:06 -06:00
Nicole Thomas
59aca733ea Merge pull request #32345 from nmadhok/patch-4 
[2015.8] Check if profile key exists in vm_ dict
 2016-04-05 10:16:35 -06:00
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
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
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
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