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
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
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
Justin Findlay
d317a77afb
Merge pull request #23491 from jayeshka/influxdb_user-states-unit-test
...
adding states/influxdb_user unit test case
2015-05-08 10:24:07 -06:00
Thomas S Hatch
6d42f30271
Merge pull request #23245 from freimer/issue_23244
...
Add Caller functionality to reactors.
2015-05-08 08:39:04 -06:00
Thomas S Hatch
ca2c21a63c
Merge pull request #23467 from slinu3d/2014.7
...
Added AWS v4 signature support
2015-05-08 08:36:19 -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
Justin Findlay
e0b2a73eb4
Merge pull request #23477 from galet/ldap-filter-escaping
...
LDAP auth: Escape filter value for group membership search
2015-05-07 16:04:47 -06:00
Shouguan Lin
0b4081d8f4
Fixed pylint error at line 363
2015-05-07 14:57:44 -07:00
Shouguan Lin
5be5eb5b14
Fixed pylink errors
2015-05-07 13:37:08 -07:00
Michal Galet
33038b9f86
LDAP auth: Escape filter value for group membership search
...
The result from a user search need to be escaped when put to the group membership search. Otherwise the search will result with:
[ERROR ] Exception thrown while retrieving group membership in AD: {'desc': 'Bad search filter'}
2015-05-07 22:35:40 +02:00
