valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
48,813 Commits 24 Branches 182 Tags 341 MiB
90819f9c37
Commit Graph

48813 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas Jackson
a4ed41ae82 Move AES command logging to trace 
This log message isn't very useful-- and for large installs this accounts for 94% of our logs
 2015-06-16 18:37:32 -07:00
Michael Steed
76cfef05ec Include Tornado in versions report 
Fixes #24439
 2015-06-16 17:37:50 -06:00
Michael Steed
54b33dd359 Fix stacktrace when --summary is used 
Fix access of ret[] in _print_returns_summary()
 2015-06-16 17:26:20 -06:00
Colton Myers
0d2dc46648 Merge pull request #24724 from basepi/merge-forward-2015.5 
[2015.5] Merge forward from 2014.7 to 2015.5
 2015-06-16 16:46:27 -06:00
Colton Myers
4641028464 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 2015-06-16 15:11:45 -06:00
twangboy
7a015389af Added additional reporting 2015-06-16 14:38:13 -06:00
Umberto Nicoletti
4d0061b832 fix infinite loop introduced by #20124 when the init system is not in the supported_inits list 2015-06-16 14:34:13 -06:00
twangboy
d84ad5d519 Fixed capitalization... Failed and Already 2015-06-16 14:32:57 -06:00
Erik Johnson
0c7fa0fca2 Optimizations for #20124 
- os.stat is quicker than os.path.isfile()
- Reading the file in chunks of __opts__['file_buffer_size'] and looking
  for the string is quicker than using the strings command by a factor
  of 10 (according to benchmarks I did with timeit), and also has the
  benefit of not depending on binutils being installed.
 2015-06-16 14:32:05 -06:00
twangboy
e9552455c4 Merge branch '2014.7' of https://github.com/saltstack/salt into fix_17041 2015-06-16 14:29:52 -06:00
cgtx
f353454327 add init system to default grains (resolve #20124) 2015-06-16 14:26:41 -06:00
Grischa Meyer
68fb5af970 fixing other test 2015-06-16 14:23:58 -06:00
Grischa Meyer
ba4f262b9c fixing text for virtual support in pyobjects 2015-06-16 14:23:58 -06:00
Grischa Meyer
b349d91a5f enable virtual package names in pyobjects renderer 2015-06-16 14:23:58 -06:00
rallytime
bfdebb6e18 Added some missing config documentation to the vsphere driver 2015-06-16 13:47:58 -06:00
rallytime
67b796d01e Remove cloud-requirements.txt 
apache-libcloud is not longer a hard-dep for salt-cloud
 2015-06-16 11:11:54 -06:00
Jacob Hammons
7c52012e31 Fixed typos 2015-06-16 09:38:11 -06:00
Justin Findlay
3d33fe7676 Merge pull request #24701 from jayeshka/selinux-states-unit-test 
adding states/selinux unit test case.
 2015-06-16 09:27:29 -06:00
Jayesh Kariya
0c136fd9c2 adding states/selinux unit test case. 2015-06-16 17:11:44 +05:30
Thomas S Hatch
2e287a9e33 Merge pull request #24687 from cachedout/min_worker_threads 
Note about minimum worker_threads
 2015-06-15 14:46:23 -06:00
Thomas S Hatch
432478ccb7 Merge pull request #24688 from cachedout/update_authors 
Update AUTHORS
 2015-06-15 14:46:03 -06:00
twangboy
144bff2f67 Report powershell output instead of error 2015-06-15 14:43:52 -06:00
Mike Place
3f6880e291 Better email 2015-06-15 11:50:01 -06:00
Mike Place
6c7b773eae Update AUTHORS 
Add Dmitry, Michael and Corin
 2015-06-15 11:47:52 -06:00
Mike Place
b7bb7eaeb2 Note about minimum worker_threads 2015-06-15 11:43:14 -06:00
Thomas S Hatch
9a2b50d59f Merge pull request #24649 from cachedout/issue_22385 
Improved error reporting for failed states
 2015-06-15 10:04:20 -06:00
Justin Findlay
66e9e16753 Merge pull request #24673 from jayeshka/schedule-states-unit-test 
adding states/schedule unit test case.
 2015-06-15 09:24:51 -06:00
Justin Findlay
5eb19c4e4d Merge pull request #24663 from kartiksubbarao/patch-2 
Update augeas_cfg.py
 2015-06-15 09:18:48 -06:00
Shane Lee
a18dadad71 Merge pull request #24646 from twangboy/fix_24196 
Fixed user.present on existing user
 2015-06-15 09:04:43 -06:00
Jayesh Kariya
54aaaa5f12 adding states/schedule unit test case. 2015-06-15 17:16:21 +05:30
Joseph Hall
4450432161 Merge pull request #24667 from dkiser/fix-cloud-keyring 
fix for #24583 clouds/openstack.py kerying first time succeeds
 2015-06-14 15:58:58 -06:00
Domingo Kiser
c92c05fac0 fix for #24583 clouds/openstack.py kerying first time succeeds 2015-06-14 11:18:34 -07:00
Thomas S Hatch
4c64ee9d94 Merge pull request #24659 from kartiksubbarao/patch-1 
Update aliases.py
 2015-06-13 11:31:42 -06:00
Kartik Subbarao
e18db50e0c Update augeas_cfg.py 
Fixes #24661. Also removes the excessive trailing space character from the path.
 2015-06-13 10:50:33 -04:00
Kartik Subbarao
d6834749e2 Update aliases.py 
Fixes #24537. Also note: the new behavior overwrites any prior superset targets with the current set. For example, given an /etc/aliases entry "a: b,c,d" and the salt state specified as "a: { alias.present: [ target: b ] }", the /etc/aliases entry is changed to "a: b". This seems okay to me, given that the documentation states "If the alias exists but the target differs from the previous entry, the target(s) will be overwritten."
 2015-06-13 08:19:34 -04:00
Mike Place
b9fe792534 States will now return the reason behind failure if a module could not be loaded 
Closes #22385
 2015-06-12 15:50:27 -06:00
Shane Lee
89eb616c29 Merge pull request #24644 from cro/2014.7-2015.5-20150612 
Merge forward 2014.7->2015.5
 2015-06-12 15:31:41 -06:00
twangboy
a208e1d60f Fixed user.present on existing user 2015-06-12 15:02:31 -06:00
C. R. Oldham
4136dc3160 Merge forward from 2014.7 to 2015.5 2015-06-12 14:24:46 -06:00
C. R. Oldham
b99484fde2 Merge pull request #24643 from cro/saltannounce 
Add reference to salt-announce mailing list.
git selfie!
 2015-06-12 14:21:14 -06:00
C. R. Oldham
ecb0623d7f Add salt-announce mailing list. 2015-06-12 14:19:27 -06:00
Colton Myers
b896a0d0e9 Merge pull request #24642 from saltstack/revert-24595-fix-iptables-target 
Revert "fix target rule, remove unneeded quotation mark"
 2015-06-12 14:14:26 -06:00
Colton Myers
5ff3224ae1 Revert "fix target rule, remove unneeded quotation mark" 2015-06-12 14:14:08 -06:00
David Boucha
635121e85d Merge pull request #24620 from twangboy/fix_24215 
Fixed comment and uncomment functions in file.py
 2015-06-12 13:36:26 -06:00
Justin Findlay
01092c2337 Merge pull request #24628 from jayeshka/reg_states-unit-test 
adding states/reg unit test case.
 2015-06-12 11:29:11 -06:00
Jacob Hammons
c7cdd416a2 Doc bug fixes 
Refs #24547
Refs #24275
Refs #24375
Refs #24560
Refs #24163
 2015-06-12 11:23:52 -06:00
Thomas S Hatch
5f491f911d Merge pull request #24631 from rallytime/bp-24591 
Back-port #24591 to 2015.5
 2015-06-12 10:54:32 -06:00
Tim Baker
f13cd418bc Add extra clarification why jinja comments are needed. 2015-06-12 10:45:41 -06:00
Tim Baker
23749718bb Fix typo 2015-06-12 10:45:41 -06:00
Tim Baker
6a917471d4 Add some documentation surrounding Jinja comments - refs #24492, #21217, #23359 2015-06-12 10:45:41 -06:00