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
48,735 Commits 24 Branches 182 Tags 341 MiB
c9c90af512
Commit Graph

48735 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
c9c90af512 Merge pull request #24771 from jacksontj/2015.5 
Always extend requisites, instead of replacing them
 2015-06-18 08:29:09 -06:00
Thomas Jackson
b1211c5422 Re-enable tests for complex prereq and prereq_in 
Since #24770 is fixed, #8211 is also fixed (since they are basically the same issue)
 2015-06-17 21:57:37 -07:00
Thomas Jackson
378f6bfc36 Only merge when the merge is of requisites 
Fix for #24770

This extends functionality is used for both requisites and extending SLSs, so instead of having a hard coded list of requisites we should use the global of all state requisite keywords.
 2015-06-17 21:57:37 -07:00
Mike Place
5fe4de8f62 Merge pull request #24766 from msteed/undoc-dns_check 
Remove doc references to obsolete minion opt
 2015-06-17 15:36:55 -06:00
Michael Steed
f92a769d35 Remove doc references to obsolete minion opt 2015-06-17 15:29:50 -06:00
Mike Place
a407ab7c51 Merge pull request #24329 from jayeshka/postgres_database-states-unit-test 
adding states/postgres_database unit test case.
 2015-06-17 13:11:02 -06:00
Mike Place
3ff6eff546 Merge pull request #24632 from jacobhammons/bug-fixes 
Doc bug fixes
 2015-06-17 12:40:02 -06:00
Mike Place
9995f64428 Merge pull request #24607 from garethgreenaway/2015_5_sending_events_multi_master 
fixes to minion.py
 2015-06-17 12:16:42 -06:00
Justin Findlay
bf2dd94389 Merge pull request #24755 from rallytime/fix_setup_15 
Remove SALT_CLOUD_REQS from setup.py
 2015-06-17 11:42:25 -06:00
Thomas S Hatch
3d53d79476 Merge pull request #24740 from rallytime/bp-24720 
Backport #24720 to 2015.5
 2015-06-17 09:43:37 -07:00
Thomas S Hatch
ac2851be55 Merge pull request #24723 from rallytime/bp-20124 
Back-port #20124 to 2015.5
 2015-06-17 09:43:20 -07:00
Nicole Thomas
78cd09b6e9 Merge pull request #24754 from alprs/docs-add_linode_location_option 
salt-cloud documentation - Add information about linode location
 2015-06-17 10:04:48 -06:00
rallytime
48769a544d Remove SALT_CLOUD_REQS from setup.py 
Since cloud-requirements.txt was removed, don't reference it in setup.py
 2015-06-17 09:56:13 -06:00
Andreas Lutro
d88e071e98 add information about linode location 2015-06-17 17:43:08 +02:00
Justin Findlay
d5554f76ec Merge pull request #24748 from jayeshka/serverdensity_device-states-unit-test 
adding states/serverdensity_device unit test case.
 2015-06-17 09:39:07 -06:00
Justin Findlay
0b7e7ef879 Merge pull request #24739 from rallytime/bp-24735 
Back-port #24735 to 2015.5
 2015-06-17 09:16:47 -06:00
Jayesh Kariya
1a4c241050 adding states/serverdensity_device unit test case. 2015-06-17 16:50:40 +05:30
Robert Davis
a9bcdb5b77 Updating master.py to properly check against groups when user 
is only authed against group.  Tested against unit.auth_test.

Fixed multiple pylint issues in my own code as well.
 2015-06-16 21:53:28 -06:00
rallytime
64c565d9be Add .0 to version number 2015-06-16 21:49:43 -06:00
Peter Tripp
5ed801b98f Add codenames for 2015.5 and future versions. Trailing newline. 2015-06-16 21:48:41 -06:00
Justin Findlay
c8713f2d00 Merge pull request #24732 from msteed/issue-24111 
Fix stacktrace when `--summary` is used
 2015-06-16 21:27:57 -06:00
Justin Findlay
70d37816bf Merge pull request #24721 from rallytime/bp-24668 
Back-port #24668 to 2015.5
 2015-06-16 21:23:47 -06:00
Justin Findlay
1b9d6895c7 Merge pull request #24718 from rallytime/update_vsphere_docs 
Added some missing config documentation to the vsphere driver
 2015-06-16 21:19:35 -06:00
Justin Findlay
64857c706d Merge pull request #24714 from rallytime/remove_cloud_reqs_15 
Remove cloud-requirements.txt
 2015-06-16 21:17:04 -06:00
Justin Findlay
f96b1d68cd Merge pull request #24733 from msteed/issue-24439 
Include Tornado in versions report
 2015-06-16 21:13:53 -06:00
Mike Place
a861fe0f4f Merge pull request #24737 from jacksontj/2015.5 
Move AES command logging to trace
 2015-06-16 19:48:11 -06:00
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
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
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
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
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