Commit Graph

2460 Commits

Author SHA1 Message Date
Javier Domingo
63620725c3 Remove trailing whitespace 2015-05-15 13:00:11 +02:00
Javier Domingo Cansino
5cab0ecc95 ssh: AuthorizedKeysFile expands defined tokens 2015-05-15 00:45:24 +02:00
Colton Myers
eca368a0ee Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 2015-05-12 16:09:12 -06:00
Nicole Thomas
b8589532d1 Merge pull request #23603 from rahulhan/states_winrepo_unit_test
Adding states/winrepo.py unit tests
2015-05-12 12:40:12 -06:00
Nicole Thomas
3cbbd6d277 Merge pull request #23602 from rahulhan/states_win_path_unit_test
Adding states/win_path.py unit tests
2015-05-12 12:39:37 -06:00
Nicole Thomas
3c904e8739 Merge pull request #23600 from rahulhan/states_win_network_unit_test
Adding states/win_network.py unit tests
2015-05-12 12:39:01 -06:00
Rahul Handay
b418404eb7 removed lint error 2015-05-12 23:06:20 +05:30
Rahul Handay
a66e7e7f1f Adding states/winrepo.py unit tests 2015-05-12 22:54:54 +05:30
Rahul Handay
122c29f71a Adding states/win_path.py unit tests 2015-05-12 22:50:02 +05:30
Rahul Handay
1be802300b Adding states/win_network.py unit tests 2015-05-12 22:45:25 +05:30
Rahul Handay
6cda890517 Adding win_firewall.py unit tests 2015-05-12 22:39:09 +05:30
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
Daniel Hobley
30d8be877d Lint fixes 2015-05-12 15:48:53 +02:00
Daniel Hobley
899ba78e79 Added power cfg module and state for windows minions
- Allows you to set power settings on a windows minion for things like the monitor and disk
2015-05-12 14:49:48 +02: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
Colton Myers
9b2f27b87f Remove unused mock_open 2015-05-11 15:52:24 -06:00
Colton Myers
3c51d36599 Remove tests.unit.modules.seed_test.test_mkconfig
Was creating False.pem and False.pub files, and wasn't compatible with
new crypt.py changes. Should be rewritten as a proper, destructive,
integration test.
2015-05-11 15:11:58 -06:00
Justin Findlay
e9b94d36d3 additional mock for rh_ip_test test_build_bond
Fixes #23473.
2015-05-11 12:31:24 -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
Colton Myers
1d77ae9072 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
Conflicts:
    salt/cloud/clouds/ec2.py
    salt/modules/hipchat.py
    salt/modules/random_org.py
    salt/modules/serverdensity_device.py
    salt/modules/slack_notify.py
    salt/returners/__init__.py
    salt/states/iptables.py
2015-05-11 11:38:03 -06:00
Justin Findlay
2bc7f9c4cd Merge pull request #23455 from techhat/smtptemplate
Allow SMTP return to use a template
2015-05-11 11:08:56 -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
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
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
Justin Findlay
0d8f865c9f update smtp returner unit tests 2015-05-11 00:23:28 -06:00
Rahul Handay
2490074aa2 Adding states/win_servermanager.py unit tests 2015-05-08 23:59:58 +05:30
Justin Findlay
604857811e Merge pull request #23495 from jayeshka/seed-unit-test
adding seed unit test case
2015-05-08 11:30:38 -06:00
Justin Findlay
70bc3c1415 Merge pull request #23494 from jayeshka/sensors-unit-test
adding sensors unit test case
2015-05-08 11:30:18 -06:00
Justin Findlay
b981b20d44 Merge pull request #23493 from jayeshka/incron-states-unit-test
adding states/incron unit test case
2015-05-08 11:29:59 -06:00
Justin Findlay
4019c493a1 Merge pull request #23492 from jayeshka/influxdb_database-states-unit-test
adding states/influxdb_database unit test case
2015-05-08 11:29:51 -06:00
Jayesh Kariya
9d4043f9ff adding states/influxdb_user unit test case 2015-05-08 16:21:17 +05:30
Jayesh Kariya
e1fcac815d adding states/influxdb_database unit test case 2015-05-08 16:16:24 +05:30
Jayesh Kariya
cc7bc170f3 adding states/incron unit test case 2015-05-08 16:15:06 +05:30
Jayesh Kariya
1fb48a31a8 adding sensors unit test case 2015-05-08 16:11:20 +05:30
Jayesh Kariya
3f134bc573 adding seed unit test case 2015-05-08 16:10:00 +05:30
Colton Myers
e6905b4073 Delete the win_useradd tests 2015-05-07 23:46:51 -06:00
Justin Findlay
ea55c44bbb Merge pull request #23468 from rahulhan/states_win_system_unit_test
Adding states/win_system.py unit tests
2015-05-07 13:20:50 -06:00
Justin Findlay
865127844a Merge pull request #23450 from jayeshka/scsi-unit-test
adding scsi unit test case
2015-05-07 13:00:28 -06:00