Erik Johnson
0210ef4434
Update mac_user unit tests to reflect changes in execution module
2015-10-13 10:52:59 -05:00
Erik Johnson
76ce6949d7
Update at unit tests to reflect changes in execution module
2015-10-13 10:52:59 -05:00
Erik Johnson
d2ad1d7892
Update rsync unit tests to reflect changes in execution module
2015-10-13 10:52:59 -05:00
Erik Johnson
362a91d42b
Remove rsync.config test since mock_open can't handle iterative reads
2015-10-13 10:52:59 -05:00
Erik Johnson
b1c60121bd
Update virtualenv unit tests to reflect changes in execution module
2015-10-13 10:52:58 -05:00
Erik Johnson
a5d6a3e768
Update pw_user unit tests to reflect changes in execution module
2015-10-13 10:52:58 -05:00
Erik Johnson
93815e6e39
remove rbenv test that doesn't really test anything
2015-10-13 10:52:58 -05:00
Richard Hansen
9aa19575fa
new ldap state module
2015-10-09 17:47:56 -04:00
Colton Myers
69d960f8e6
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
...
Conflicts:
doc/man/salt.7
doc/topics/ssh/index.rst
salt/modules/boto_secgroup.py
salt/modules/dockerng.py
salt/states/archive.py
salt/states/boto_elb.py
salt/states/boto_secgroup.py
tests/unit/modules/schedule_test.py
2015-10-07 13:11:48 -06:00
Nicole Thomas
1b9e814c13
Merge pull request #27718 from rallytime/merge-27635-and-27552
...
Merge #27635 and #27552
2015-10-06 12:40:24 -06:00
Nicolas Delaby
edf625c8b4
Add support of labels parameter for dockerng
2015-10-06 13:18:05 +02:00
Stephen Woodrow
509ded1bd0
Fix some tests.
2015-10-05 20:57:17 -07:00
Colton Myers
77516912fa
Merge pull request #27630 from ticosax/include-container-id-docker-mine
...
Expose container_id in mine.get_docker
2015-10-05 15:56:53 -06:00
Colton Myers
7a4291008e
Merge pull request #27689 from rallytime/fix-tests-27448
...
Merge #27448 with test fixes
2015-10-05 15:17:41 -06:00
rallytime
05a506ec9f
Use correct comment in test
2015-10-05 14:02:13 -06:00
rallytime
8296fefb31
Merge #27448 with test fixes
2015-10-05 12:33:03 -06:00
Ethan Moore
c7aea90546
Adding tags to OrderedDict in test module
...
Adding SaltInvocationError import
2015-10-02 20:10:07 +00:00
Nicolas Delaby
9e56a7e9db
Expose container_id in mine.get_docker
...
Because sometimes we should be able to perform additional introspection.
2015-10-02 21:30:33 +02:00
Nicole Thomas
e103f53b4f
Merge pull request #27485 from lyft/boto-asg-scheduled-actions
...
Add scheduled actions (like scaleup/scaledown actions) to boto_asg
2015-10-01 09:18:19 -06:00
Ryan Lane
714a93900b
Patch config.option
2015-09-30 10:04:10 -07:00
Mike Place
fd11e0cd95
Merge pull request #27522 from twangboy/fix_26629
...
Removed dependency on powershell to restart salt-minion
2015-09-30 10:19:29 -06:00
C. R. Oldham
eb76531e96
Merge pull request #27550 from rallytime/cloud-logging
...
[2015.8] Clean up salt-cloud logging and make it more useful
2015-09-30 09:48:53 -06:00
Nicole Thomas
e5de9409c2
Merge pull request #27525 from basepi/merge-forward-2015.8
...
[2015.8] Merge forward from 2015.5 to 2015.8
2015-09-29 21:38:22 -06:00
rallytime
78c85fbb31
Add unit tests for new recursive function
2015-09-29 21:25:47 -06:00
Colton Myers
1f3eb1c526
Remove useless mocked unit test
2015-09-29 18:23:46 -06:00
Colton Myers
41cad702e3
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
...
Conflicts:
salt/minion.py
salt/modules/rest_service.py
salt/states/dockerng.py
salt/utils/cloud.py
2015-09-29 18:13:33 -06:00
twangboy
163c54505d
Fixed tests... hopefully
2015-09-29 15:28:23 -06:00
Colton Myers
73b90f155e
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
doc/topics/cloud/gce.rst
doc/topics/windows/windows-package-manager.rst
salt/client/ssh/state.py
salt/cloud/clouds/ec2.py
salt/modules/defaults.py
salt/modules/file.py
salt/utils/cloud.py
2015-09-29 14:56:41 -06:00
Nicole Thomas
e974a3c8aa
Merge pull request #27510 from rallytime/ryan-lane-test-fix
...
Merge #27475 with test fixes
2015-09-29 12:34:32 -06:00
rallytime
cae2c4e715
Syntax fix
2015-09-29 10:02:16 -06:00
rallytime
458547ba03
Fix test failures for boto __state__ changes
2015-09-29 09:55:44 -06:00
Mike Place
d85b0cbd69
Merge pull request #27451 from ticosax/dockerng-host-config-support
...
[dockerng] Enforce usage of host_config and require docker-py>=1.4.0
2015-09-29 09:51:28 -06:00
Nicolas Delaby
fadd9bd43e
Add test to check we don't call inspect_image on absent images.
2015-09-29 15:53:29 +02:00
Nicolas Delaby
b184faa55b
Enforce usage of host_config and require docker-py>=1.4.0
2015-09-28 23:24:57 +02:00
Mike Place
0bc37c0d41
Fix test
2015-09-28 12:57:22 -06:00
Nicolas Delaby
a1ed6cda56
Skip test if docker-py is not installed
2015-09-28 19:53:10 +02:00
Mike Place
74095b6b22
Lint
2015-09-28 11:48:51 -06:00
Nicolas Delaby
cc8471bd1b
dockerpy expect only command argument not cmd
2015-09-28 10:08:40 -05:00
justinta89
fd0dedeb99
Skipping Async tests
...
Skipping the transport async tests until we can devote more time to fixing the
test failures associated with them.
2015-09-24 13:41:58 -06:00
Daniel Hobley
f972c39333
Lint fixes
2015-09-24 12:41:56 +02:00
Daniel Hobley
40db871e2b
Added the ability to trim the returned files from an unzip
...
- This reduces log spamming when you unzip thousands of files, it defaults to off
2015-09-24 11:43:21 +02:00
Mike Place
23fcc9e348
Merge pull request #27248 from tinyclues/better_cors_headers
...
[Saltnado] - The CORS implementation was a bit naive about headers allowance.
2015-09-23 08:50:06 -06:00
Mike Place
3933eed307
Merge pull request #27249 from tinyclues/login_support_more_content_type
...
[Saltnado] - Add the support of login payload in JSON and YAML.
2015-09-23 08:49:42 -06:00
Mike Place
f63f4d8c43
Merge pull request #27289 from terminalmage/encrypted-cli-pillar
...
Feature add: Encrypted CLI pillar data
2015-09-22 10:34:13 -06:00
Erik Johnson
bacc76c355
Update mocked objects for state module tests
...
Added the new pillar_enc value
2015-09-22 08:25:51 -05:00
FELD Boris
6417161fd7
The CORS implementation was a bit naive about headers allowance.
...
A preflight request send the list of headers of the final request
in a special header ```Access-Control-Request-Headers```.
The server must returns the list of allowed header in the special header
```Access-Control-Allow-Headers```.
This PR just returns the whole list of headers but may allow filtering of some
of them quite easily. I'm not sure to see how filtering how headers may
impact security, if anyone has some leads.
2015-09-18 23:24:43 +02:00
FELD Boris
a4fd1e75c5
Add the support of login payload in JSON and YAML.
...
Login endpoint supported only application/x-www-form-urlencoded which may
be an useless limitation. This PR add support for more content-type,
JSON and YAML and every content-type supported by saltnado in general
as it uses the same deserialisation method than the lowstate deserialisation.
2015-09-18 19:16:47 +02:00
Colton Myers
9864d9e0fa
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
...
Conflicts:
doc/ref/modules/all/index.rst
doc/topics/releases/boron.rst
salt/cli/daemons.py
salt/cli/salt.py
salt/modules/jboss7.py
salt/states/file.py
2015-09-18 11:03:37 -06:00
Colton Myers
9ddc88c6ba
Merge pull request #27198 from basepi/merge-forward-develop
...
Merge forward from 2015.8 to develop
2015-09-17 15:33:15 -06:00
Colton Myers
1cbfa06591
Remove heavily-mocked failing test
2015-09-17 14:38:05 -06:00
