Commit Graph

47078 Commits

Author SHA1 Message Date
Nicole Thomas
4f5986cc0d Merge pull request #22652 from rahulhan/states_group_unit_tests
Adding states/group.py unit test cases
2015-04-14 12:46:41 -06:00
Nicole Thomas
f39987a877 Merge pull request #22667 from saltstack/revert-22640-win_dns_client-new-unit-test
Revert "adding win_dns_client unit test case"
2015-04-14 12:23:13 -06:00
Nicole Thomas
6a1b02f58b Revert "adding win_dns_client unit test case" 2015-04-14 12:22:58 -06:00
Michael Steed
5efb284c22 Update salt-call manpage to match cli help text
refs #22239
2015-04-14 11:52:55 -06:00
Bret Fisher
94cd5d0219 give SmartOS/sunos5 the correct CONFIG_DIR
Fixes #22634
2015-04-14 11:40:26 -06:00
Mathieu Drapeau
3bbaf2aaff Being able to deploy ssh id key to multiple hosts
This fixes https://github.com/saltstack/salt/issues/22661
2015-04-14 13:18:02 -04: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
795c01d362 Merge pull request #22656 from jfindlay/bp-22624
backport #22624 to 2014.7
2015-04-14 10:50:33 -06:00
Thomas S Hatch
0418d91175 Merge pull request #22590 from cachedout/ssh_catch_returner_exc
Catch errors when returner unavailable in salt-ssh
2015-04-14 10:16:05 -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
Artur Kaszuba
e4d8478eae Remove blank line 2015-04-14 09:01:44 -06:00
Corin Kochenower
60b48ce1c0 Simple textual change 2015-04-14 08:54:34 -06:00
Artur Kaszuba
0a5c345889 Fix for high cpu usage by salt-ssh 2015-04-14 08:48:13 -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
Rahul Handay
b61c3ea15e Adding states/group.py unit test cases 2015-04-14 19:12:49 +05:30
Jayesh Kariya
1d423feeba adding pecl unit test case. 2015-04-14 17:58:15 +05:30
Jayesh Kariya
aa3a793d8f removed Mocknetwork call 2015-04-14 17:42:15 +05:30
Mathieu Le Marec - Pasquet
b9f4cc42ae lxc: optims 2015-04-14 13:33:19 +02:00
Mathieu Le Marec - Pasquet
4821dba6cc lxc: dont use cache in exists, if not existant
This fixes #22644
2015-04-14 13:26:33 +02:00
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
1bb4251aa1 adding win_network unit test case 2015-04-14 15:49:20 +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
Mike Place
1e9c384698 Catch errors when returner unavailable in salt-ssh 2015-04-13 16:46:10 -06:00
Mike Place
43aa8b334d Avoid minion-specific messages on master start
Closes #17189
2015-04-13 16:43:55 -06:00
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
05a9f47356 merge 22115 in correct branch 2015-04-13 15:50:37 -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