Commit Graph

47107 Commits

Author SHA1 Message Date
Justin Findlay
e6b6ee8ce5 Merge pull request #22706 from rahulhan/states_nftables_unit_tests
Adding states/nftables.py unit test cases
2015-04-15 10:29:23 -06:00
Justin Findlay
58735aaa62 Merge pull request #22701 from rahulhan/states_iptables_unit_tests
Adding states/iptables.py unit tests
2015-04-15 10:24:10 -06:00
Thomas S Hatch
3f800a7fd2 Merge pull request #22639 from jayeshka/win_network-new-unit-test
adding win_network unit test case
2015-04-15 09:55:54 -06:00
Thomas S Hatch
1fc1185d6c Merge pull request #22408 from ag-wood/minion-provider
Reinstate minion config provider override as per doco
2015-04-15 09:40:39 -06:00
Thomas S Hatch
cc3e11324f Merge pull request #22696 from rahulhan/state_unit_test_cases
Adding state.py unit test
2015-04-15 08:15:24 -06:00
Rahul Handay
d3e25ff4ae Adding states/nftables.py unit test cases 2015-04-15 18:55:21 +05:30
Rahul Handay
e6b6c41785 Adding states/iptables.py unit tests 2015-04-15 17:15:23 +05:30
Rahul Handay
83aa84c2a7 Adding state.py unit test 2015-04-15 13:01:36 +05:30
Jayesh Kariya
4c2a3f01b5 used @patch for mocking. 2015-04-15 12:10:54 +05:30
Justin Findlay
3a5a60b5a7 Merge pull request #22688 from msteed/issue-22676
Add missing command line options to man pages
2015-04-14 23:17:47 -06:00
Justin Findlay
34526d536d Merge pull request #22678 from matdrapeau/22669_fix_clustershell_host_names_prime
Fix the clustershell roster host names (CLEAN)
2015-04-14 23:15:10 -06:00
Thomas S Hatch
fb31ab4dd5 Merge pull request #22693 from dmyerscough/fix-keyerror-in-salt-cloud
Fixing key error
2015-04-14 22:06:45 -06:00
Damian Myerscough
f35c3bd8b6 Fixing key error 2015-04-14 19:53:16 -07:00
Michael Steed
70f1ca9ea5 Add missing command line options to man pages
Refs #22676
2015-04-14 17:32:56 -06:00
Colton Myers
f1ba391624 Trailing slash 2015-04-14 17:23:06 -06:00
Nicole Thomas
23a9d77fd2 Merge pull request #22674 from jacobhammons/2014.7
Regenerated salt-call and salt.7 man pages
2015-04-14 15:42:44 -06:00
Mathieu Drapeau
56a0ea97d3 Fix the clustershell roster host names (CLEAN)
This fixes: https://github.com/saltstack/salt/issues/22669
This closes: https://github.com/saltstack/salt/pull/22670
2015-04-14 17:14:44 -04:00
Colton Myers
cc3dca78d3 Move the pylint ignore to catch all relevant imports 2015-04-14 15:13:31 -06:00
Thomas S Hatch
2d6fcf0190 Merge pull request #22612 from cachedout/issue_17189
Avoid minion-specific messages on master start
2015-04-14 14:15:35 -06:00
Erik Johnson
9b275814f0 Merge pull request #22645 from makinacorpus/lxcache
lxc: dont use cache in exists, if not existant
2015-04-14 15:07:29 -05:00
Thomas S Hatch
9c7a8a8145 Merge pull request #22664 from rallytime/bp-22635
Backport #22635 to 2015.2
2015-04-14 14:07:21 -06:00
Thomas S Hatch
781e5908f6 Merge pull request #22662 from matdrapeau/22661_deploy_id_to_multiple_hosts
Being able to deploy ssh id key to multiple hosts
2015-04-14 14:07:12 -06:00
Jacob Hammons
6e416fc300 Regenerated salt-call and salt.7 man pages Refs #22239 2015-04-14 13:56:31 -06:00
Nicole Thomas
c0d1bdd60b Merge pull request #22666 from msteed/issue_22239
Update salt-call manpage to match cli help text
2015-04-14 13:24:03 -06:00
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
Nicole Thomas
edeec678d4 Merge pull request #22623 from thatch45/merge_22115
merge 22115 in correct branch
2015-04-14 12:47:20 -06:00
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