Commit Graph

47811 Commits

Author SHA1 Message Date
Rahul Handay
4cde78a58a Adding states/vbox_guest.py unit tests 2015-05-12 22:31:03 +05:30
Thomas S Hatch
9beb7bc529 Merge pull request #23469 from s0undt3ch/hotfix/call-the-win-func
Call the windows specific function not the general one
2015-05-12 10:47:22 -06:00
Nicole Thomas
d2f097584c Merge pull request #23583 from jayeshka/ipset_states-unit-test
adding states/ipset unit test case
2015-05-12 10:31:55 -06:00
Nicole Thomas
82a47e8cbf Merge pull request #23582 from jayeshka/keyboard_states-unit-test
adding states/keyboard unit test case
2015-05-12 10:31:17 -06:00
Nicole Thomas
77e5b28566 Merge pull request #23581 from jayeshka/layman_states-unit-test
adding states/layman unit test case
2015-05-12 10:30:36 -06:00
Nicole Thomas
cbe32828ef Merge pull request #23580 from jayeshka/smf-unit-test
adding smf unit test case
2015-05-12 10:29:58 -06:00
Nicole Thomas
16a333832a Merge pull request #23572 from The-Loeki/ssh_auth_fix
Fix regression of #21355 introduced by #21603
2015-05-12 10:28:05 -06:00
Nicole Thomas
f843f89cd7 Merge pull request #23565 from garethgreenaway/2015_2_aptpkg_upgrade_default_to_upgrade
fix to aptpkg module
2015-05-12 10:25:46 -06:00
Thomas S Hatch
c1157cdaee Merge pull request #23550 from jfindlay/fix_rh_ip_test
additional mock for rh_ip_test test_build_bond
2015-05-12 09:17:16 -06:00
Jayesh Kariya
4f9719157b adding smf unit test case 2015-05-12 18:06:49 +05:30
Jayesh Kariya
297b055b1c adding states/layman unit test case 2015-05-12 18:05:35 +05:30
Jayesh Kariya
fa94d7ab5c adding states/keyboard unit test case 2015-05-12 18:04:26 +05:30
Jayesh Kariya
4330cf4a6e adding states/ipset unit test case 2015-05-12 18:03:14 +05:30
Ronald van Zantvoort
d8248dd368 Fix regression of #21355 introduced by #21603 2015-05-12 12:10:47 +02:00
Gareth J. Greenaway
97ae514641 aptpkg.upgrade should default to upgrade instead of dist_upgrade. 2015-05-11 16:46:58 -07:00
Justin Findlay
b593328176 Merge pull request #23552 from garethgreenaway/2015_5_returner_fix_broken_previous_pr
Fix for an issue caused by a previous pull request
2015-05-11 15:54:59 -06:00
Justin Findlay
d0f96825dd Merge pull request #23547 from slinu3d/2015.5
Added AWS v4 signature support for 2015.5
2015-05-11 15:52:24 -06:00
Gareth J. Greenaway
7d70e2b334 Passed argumentes in the call _fetch_profile_opts to were in the wrong order 2015-05-11 11:42:20 -07:00
Justin Findlay
e9b94d36d3 additional mock for rh_ip_test test_build_bond
Fixes #23473.
2015-05-11 12:31:24 -06:00
Shouguan Lin
f3bfdb561b Fixed urlparse and urlencode calls 2015-05-11 11:17:10 -07:00
Justin Findlay
06c6a1f44a Merge pull request #23544 from basepi/merge-forward-2015.5
[2015.5] Merge forward from 2014.7 to 2015.5
2015-05-11 12:02:06 -06:00
Justin Findlay
aa5b896d3e Merge pull request #23470 from twangboy/fix_svc_restart
Fixed service.restart for salt-minion
2015-05-11 11:54:47 -06:00
Shouguan Lin
802dbdb965 Added AWS v4 signature support for 2015.5 2015-05-11 10:41:53 -07:00
Colton Myers
f8a36bc155 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5
Conflicts:
    salt/cloud/clouds/ec2.py
    salt/utils/validate/ssh.py
2015-05-11 11:10:47 -06:00
Justin Findlay
67988b21ee Merge pull request #23539 from rahulhan/states_virtualenv_mod_unit_test
Adding states/virtualenv_mod.py unit tests
2015-05-11 11:02:31 -06:00
Colton Myers
6f0cf2e21f Merge remote-tracking branch 'upstream/2015.2' into 2015.5 2015-05-11 10:59:25 -06:00
Justin Findlay
c96619653e Merge pull request #23423 from cachedout/remove_jid_event_from_orch
Remove jid_event from state.orch
2015-05-11 10:36:12 -06:00
Rahul Handay
750bb07d1c Adding states/virtualenv_mod.py unit tests 2015-05-11 21:49:59 +05:30
salt_build
b3f284c517 Fixed tests 2015-05-11 15:49:19 +00:00
salt_build
ad44d79f26 Fixed service.restart for salt-minion 2015-05-11 15:37:45 +00:00
C. R. Oldham
b79fed3a92 Merge pull request #23538 from cro/licupdate
Update date in LICENSE file
2015-05-11 09:19:25 -06:00
Thomas S Hatch
c3f03d827d Merge pull request #23513 from gladiatr72/RFC_stop_iptables.check_from_short-circuiting_position-only_delete_rule
short-circuit auto-failure of iptables.delete state
2015-05-11 09:18:33 -06:00
C. R. Oldham
345efe25c9 Update date in LICENSE file 2015-05-11 09:17:39 -06:00
Justin Findlay
4e77f6f8c4 Merge pull request #23534 from jayeshka/ini_manage_states-unit-test
adding states/ini_manage unit test case
2015-05-11 08:32:06 -06:00
Justin Findlay
11ba9ed99b Merge pull request #23533 from jayeshka/hipchat-states-unit-test
adding states/hipchat unit test case
2015-05-11 08:30:22 -06:00
Justin Findlay
e5421139d3 Merge pull request #23532 from jayeshka/ipmi-states-unit-test
adding states/ipmi unit test case
2015-05-11 08:28:15 -06:00
Justin Findlay
9ba85fd31a Merge pull request #23531 from jayeshka/service-unit-test
adding service unit test case
2015-05-11 08:27:12 -06:00
Justin Findlay
32838cd888 Merge pull request #23517 from garethgreenaway/23512_2015_5_returners_with_profiles
fix to returners
2015-05-11 08:20:51 -06:00
Jayesh Kariya
831223c31c adding states/ini_manage unit test case 2015-05-11 18:07:02 +05:30
Jayesh Kariya
3ad5314ee0 adding service unit test case 2015-05-11 18:01:10 +05:30
Jayesh Kariya
fc3e64a8a4 adding states/ipmi unit test case 2015-05-11 17:59:54 +05:30
Jayesh Kariya
41d14b322d adding states/hipchat unit test case 2015-05-11 17:57:06 +05:30
Gareth J. Greenaway
81e31e27cf fix for returners that utilize profile attributes. code in the if else statement was backwards. #23512 2015-05-09 18:35:07 -07:00
Stephen Spencer
c71714c364 short-circuit auto-failure of iptables.delete state if position argument is
set without the other accoutrements that check_rule requires.
2015-05-09 16:30:30 -05:00
Thomas S Hatch
2bb09b7ee7 Merge pull request #23509 from keesbos/Catch_empty_environment
Catch the unset (empty/None) environment case
2015-05-09 07:24:37 -06:00
Thomas S Hatch
a123a36f05 Merge pull request #23505 from aneeshusa/remove-unused-ssh-config-validator
Remove unused ssh config validator. Fixes #23159.
2015-05-09 07:24:15 -06:00
Kees Bos
6dedeaccd2 Catch the unset (empty/None) environment case 2015-05-09 07:04:36 +02:00
Aneesh Agrawal
90af1672ca Remove unused ssh config validator. Fixes #23159. 2015-05-08 16:47:41 -04:00
Justin Findlay
6be7d8d13b Merge pull request #23502 from rahulhan/states_win_servermanager_unit_test
Adding states/win_servermanager.py unit tests
2015-05-08 13:47:18 -06:00
Rahul Handay
2490074aa2 Adding states/win_servermanager.py unit tests 2015-05-08 23:59:58 +05:30