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
47,012 Commits 24 Branches 182 Tags 341 MiB
e0c212866b
Commit Graph

47012 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Colton Myers
e0c212866b Missing trailing underscore for test 2015-04-14 12:59:27 -06:00
Colton Myers
a02ced40f0 Lint 2015-04-14 12:57:25 -06:00
Colton Myers
a035402695 Use six.move.configparser instead of salt._compat 2015-04-14 12:56:35 -06:00
Colton Myers
9099884809 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
    doc/topics/cloud/config.rst
    salt/modules/win_disk.py
    salt/modules/yumpkg.py
    salt/pillar/s3.py
    salt/states/service.py
    salt/utils/event.py
    tests/integration/netapi/rest_tornado/test_app.py
    tests/integration/netapi/test_client.py
    tests/unit/states/archive_test.py
 2015-04-14 11:03:03 -06:00
Justin Findlay
9a2aca4671 Merge pull request #22643 from TimJones/fix-pkgrepo-ppa-missing-add-apt-repository 
Fix aptpkg.mod_repo returning OK even if apt-add-repository fails.
 2015-04-14 09:30:25 -06:00
Justin Findlay
fbb89b0766 Merge pull request #22655 from ckochenower/2015.2 
Simple textual change
 2015-04-14 09:10:46 -06:00
Justin Findlay
0b65822264 Merge pull request #22647 from jayeshka/pecl-unit-test 
adding pecl unit test case.
 2015-04-14 09:09:11 -06:00
Corin Kochenower
60b48ce1c0 Simple textual change 2015-04-14 08:54:34 -06:00
Justin Findlay
0795c64afa Merge pull request #22640 from jayeshka/win_dns_client-new-unit-test 
adding win_dns_client unit test case
 2015-04-14 08:46:14 -06:00
Justin Findlay
d21d360b04 Merge pull request #22642 from rahulhan/states_mdadm_unit_tests 
Adding states/mdadm.py unit test cases
 2015-04-14 08:45:55 -06:00
Justin Findlay
a7e55d6c1c Merge pull request #22641 from rahulhan/states_locale_unit_tests 
Adding states/locale.py unit test cases
 2015-04-14 08:45:24 -06:00
Justin Findlay
25fedf5e83 Merge pull request #22637 from jayeshka/saltmod-states-unit-test 
adding states/saltmod unit test case.
 2015-04-14 08:42:24 -06:00
Justin Findlay
0860843638 Merge pull request #22636 from rahulhan/states_service_unit_test 
Adding states/service.py unit test cases
 2015-04-14 08:41:28 -06:00
Justin Findlay
a219be7c07 Merge pull request #22625 from rallytime/bp-22565 
Backport #22565 to 2014.7
 2015-04-14 08:13:26 -06:00
Justin Findlay
2d859a5e3d Merge pull request #22624 from rallytime/bp-22563 
Backport #22563 to 2015.2
 2015-04-14 08:12:24 -06:00
Jayesh Kariya
1d423feeba adding pecl unit test case. 2015-04-14 17:58:15 +05:30
Tim Jones
5099621512 Fix aptpkg.mod_repo returning OK even if apt-add-repository fails. 
Fixes #22638. aptpkg.mod_repo raises an error if apt-add-repository
returns with a non-zero exit code.
 2015-04-14 12:48:53 +02:00
Rahul Handay
8bbb9e010c Adding states/mdadm.py unit test cases 2015-04-14 16:04:26 +05:30
Rahul Handay
febc12e6b4 Adding states/locale.py unit test cases 2015-04-14 16:02:30 +05:30
Jayesh Kariya
6abe3fa0f4 adding win_dns_client unit test case 2015-04-14 15:55:11 +05:30
Jayesh Kariya
0f6fbf66d7 adding states/saltmod unit test case. 2015-04-14 14:30:58 +05:30
Rahul Handay
7f73bdd523 Adding states/service.py unit test cases 2015-04-14 12:35:50 +05:30
Artur Kaszuba
ecc14deff8 Increase frequency of ssh terminal output checking 2015-04-13 16:03:35 -06:00
Artur Kaszuba
c0fa648226 Remove blank line 2015-04-13 16:01:25 -06:00
Artur Kaszuba
178493e8f2 Fix for high cpu usage by salt-ssh 2015-04-13 16:01:25 -06:00
Thomas S Hatch
670c07b6fd Merge pull request #22621 from rallytime/release_note_change 
Add note about missing state internal keyword arguments to release notes
 2015-04-13 15:32:15 -06:00
rallytime
fb03af37d3 Add note about missing state internal keyword arguments to release notes 2015-04-13 15:29:55 -06:00
Thomas S Hatch
e24ffa05d9 Merge pull request #22610 from rallytime/batch-bug_note 
Add batch matching bug note to known issues in 2014.7.4 release notes
 2015-04-13 15:25:12 -06:00
Thomas S Hatch
953a625e9e Merge pull request #22608 from garethgreenaway/19003_2014_7_mount_fixes 
remount related fixes in 2014.7
 2015-04-13 15:25:04 -06:00
Thomas S Hatch
9a0011c8a8 Merge pull request #22599 from rallytime/bp-19315 
Backport #19315 to 2015.2
 2015-04-13 15:24:43 -06:00
Thomas S Hatch
fe7ad0ef25 Merge pull request #22476 from tjstansell/fix-21998 
fix #21998 - use yum reposdir as basedir defaults
 2015-04-13 14:53:39 -06:00
Thomas S Hatch
0682b1049e Merge pull request #22603 from garethgreenaway/22586_2015_2_sshfs_mount_options 
Fixes to mount.mounted state module
 2015-04-13 14:40:20 -06:00
Thomas S Hatch
289f6cbd04 Merge pull request #22597 from hvnsweeting/fix-sls-requisite-not-found 
fix #12480
 2015-04-13 14:39:52 -06:00
Thomas S Hatch
bd83b6c0b5 Merge pull request #22553 from alprs/fix-git_latest_empty 
Make git.latest work with empty source repositories
 2015-04-13 14:12:04 -06:00
rallytime
9eb273f097 Add batch matching bug note to known issues in 2014.7.4 release notes 2015-04-13 13:35:48 -06:00
Gareth J. Greenaway
2278930c94 Adding cvfs and any fuse based filesystem to the list of filesystems that should not be remounted, rather unmounted and mounted again. 2015-04-13 12:10:56 -07:00
Seth House
7879876b9f Merge pull request #22604 from ckochenower/2015.2 
Make it clear which versions of CherryPy will work with SSL
 2015-04-13 12:06:13 -06:00
Corin Kochenower
73a291ead7 Add more clarifying verbiage pertaining to the CherryPy SSL error 2015-04-13 11:59:29 -06:00
Gareth J. Greenaway
c690158a03 Adding sshfs mount options to the invisible list. These options force a reboot since they won't be listed in the currently mounted device listing. 2015-04-13 10:50:40 -07:00
Corin Kochenower
0be8de1624 Document which versions of cherrypy currently work with SSL 2015-04-13 10:58:10 -06:00
root
e852dec4f7 Changed from using type() to isinstance() per pull request comment 2015-04-13 10:23:25 -06:00
Shad Nygren
e02bd8fa0d Fix TypeError: string indices must be integers, not str in ec2.py create_attach_volumes() 2015-04-13 10:23:25 -06:00
Shad Nygren
99cacf7fd3 Fix AttributeError: 'list' object has no attribute 'items' in cloud.py run_func_until_ret_arg() 2015-04-13 10:23:25 -06:00
Nicole Thomas
0ab8af8802 Merge pull request #22593 from rallytime/fix_windows_unit_tests 
Remove Mockwinapi mocking class from win_dns_client_test
 2015-04-13 10:16:01 -06:00
Nicole Thomas
a0105d9f26 Merge pull request #22594 from saltstack/revert-22583-win_network-unit-test 
Revert "adding win_network unit test case."
 2015-04-13 10:14:58 -06:00
Viet Hung Nguyen
d03970f41c fix #12480 
When req_val = 'redis', req_key = 'sls', if chunk['__id__'] is 'redis',
but chunk['state'] is not 'sls',
then code would never run into ``elif`` clause.
 2015-04-13 22:57:10 +07:00
Nicole Thomas
89d53bc063 Revert "adding win_network unit test case." 2015-04-13 09:56:05 -06:00
rallytime
b5d8c21c85 Remove Mockwinapi mocking class from win_dns_client_test 
The tests run on the same process, the Mockwinapi class is squashing
salt.utils and causing problems in the test suite.

Refs #22582
 2015-04-13 09:53:48 -06:00
Justin Findlay
bdfed667c9 Merge pull request #22579 from rahulhan/xapi_unit_tests 
Adding xapi.py unit test cases
 2015-04-13 09:13:07 -06:00
Justin Findlay
994f398f12 Merge pull request #22576 from batulin-s/fix-checking-available-package-portage 
fixed #22329 bug
 2015-04-13 09:09:34 -06:00