valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-09 01:36:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
76,565 Commits 24 Branches 182 Tags 341 MiB
d800f9ecf8
Commit Graph

3260 Commits

Author SHA1 Message Date
rallytime
29f45c192c Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/cloud/clouds/ec2.py
  - salt/modules/grains.py
 2016-12-12 11:23:57 -07:00
Nicole Thomas
23c039347e Merge pull request #38182 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2016-12-09 14:25:47 -07:00
Nicole Thomas
fc95045ba1 Reset socket default timeout to None (fixes daemons_tests failures) (#38181) 
Also removed skipIf logic when on Python 2.6. This fix resolves the
same test failures on 2.6 as well as Ubuntu 12 (which is apparently
running Pyhton 2.7 on our test images from Linode these days).
 2016-12-09 13:49:44 -07:00
rallytime
627242ab5d Merge branch '2016.3' into '2016.11' 
Conflicts:
  - tests/unit/config/config_test.py
 2016-12-09 11:45:14 -07:00
Mike Place
65b2ad7b14 Merge pull request #38163 from Ch3LL/enabled_ec2_cloud 
enabled ec2 cloud tests
 2016-12-09 11:01:57 -07:00
Denys Havrysh
a449980672 Correct cp.get_file_str docstring and add integration tests 2016-12-09 13:05:57 +02:00
Ch3LL
be74c45463 enabled ec2 cloud tests 2016-12-08 12:39:42 -07:00
Mike Place
cfc6f4b530 Merge pull request #38055 from whiteinge/sls-file-running-dict 
Add the __sls__ field to the highstate output (the running dict)
 2016-12-08 11:04:05 -07:00
Seth House
84dce83860 Switch type comparison to isinstance 2016-12-08 02:38:34 -07:00
rallytime
4998b8d116 Merge branch '2016.11' into 'develop' 
Conflicts:
  - doc/ref/configuration/master.rst
  - doc/ref/peer.rst
  - doc/topics/reactor/index.rst
 2016-12-07 16:31:11 -07:00
rallytime
fec9dec23a Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/modules/win_pkg.py
  - tests/unit/daemons_test.py
  - tests/unit/states/file_test.py
 2016-12-06 16:23:51 -07:00
Nicole Thomas
9969544653 Account for case where vim install already exists and is at an older version (#38112) 2016-12-06 16:07:56 -07:00
rallytime
9b2bbe77ef Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/modules/archive.py
  - salt/netapi/rest_tornado/saltnado.py
 2016-12-06 10:03:10 -07:00
Seth House
15826ca207 Add integration test for checking the type of the __sls__ field 
We should add a bunch more of these for other fields. Or we should just
use Typings to define the return from the state functions. ^_^
 2016-12-05 14:08:20 -07:00
Seth House
e4cf3931b3 Add integration test for the running dictionary structure 
This will fail if we remove/rename any fields from the running
dictionary by accident.
 2016-12-05 14:08:20 -07:00
Mike Place
1ac53e5196 Merge pull request #38004 from terminalmage/issue37969 
Fix regression in user/group mgmt for archive.extracted
 2016-12-02 11:28:48 -07:00
Mike Place
03e0fd39d1 Merge pull request #37963 from terminalmage/tgt_type 
Deprecate expr_form argument in the LocalClient
 2016-12-02 02:45:16 -07:00
rallytime
f2c045520d Write an integration test demonstrating the issue 2016-12-01 16:52:03 -07:00
Erik Johnson
94a16ada7b Replace usage of deprecated expr_form in tests 2016-12-01 16:21:49 -06:00
Mike Place
84e4fe1bd7 Merge pull request #37998 from Ch3LL/add_init_delay 
Add init delay
 2016-11-30 13:23:01 -07:00
Mike Place
1e3bb2e12a Newline for lint 2016-11-30 13:22:53 -07:00
Erik Johnson
23bb90a7ce Add integration test for archive.extracted with user/group set to root 2016-11-30 13:11:41 -06:00
Mike Place
b158bb6557
Fix gem test (develop) 2016-11-30 10:56:41 -07:00
Ch3LL
8c9e9de335 change name 2016-11-30 10:27:37 -07:00
Ch3LL
1d52c18316 add init_delay option for service.dead state module 2016-11-30 10:22:05 -07:00
Mike Place
1d221aa91c
Update gem test for 2016.11 2016-11-30 09:44:56 -07:00
rallytime
ac8524fb91 [Nitrogen Deprecation] Remove SaltAPI.run() function 
Also remove reference to SaltAPI.run() call and move to SaltAPI.start()
call instead in integration/__init__.py
 2016-11-29 14:18:40 -07:00
Mike Place
894cca3427
Update test for new gem ver 2016-11-28 11:17:07 -07:00
Pedro Algarvio
cbcd4ce123
Make terminate_process_pid match latest form salt-testing. 
Namely https://github.com/saltstack/salt-testing/commit/094d00784812
 2016-11-24 13:19:56 +00:00
rallytime
6479a22c1d Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/modules/napalm_network.py
 2016-11-18 07:50:16 -07:00
rallytime
d5a7ef6ca8 Merge branch '2016.3' into '2016.11' 
No conflicts.
 2016-11-17 10:37:42 -07:00
Ch3LL
9ef41dcdfc change size and image of joyent profile 2016-11-16 11:54:21 -07:00
rallytime
1aa463b4c1 Merge branch '2016.3' into '2016.11' 
No conflicts.
 2016-11-16 09:27:06 -07:00
Mike Place
f3496297a6 Don't check archive if the archive can't be found (#37723) 
Fixes possible false postive failure in archive test
 2016-11-16 09:23:39 -07:00
rallytime
5f4a73f880 Merge branch '2016.11' into 'develop' 
No conflicts.
 2016-11-16 08:55:22 -07:00
Ch3LL
363122c675 add timeout increase on azure tests 2016-11-15 10:27:44 -07:00
twangboy
a0429cf839 Use nfsd instead of apsd for test_disabled 2016-11-15 09:44:42 -07:00
twangboy
053198aa45 Fix tab 2016-11-15 09:33:01 -07:00
Jenkins
384cf67de5 Use nfsd instead of apsd to test disabled 2016-11-15 09:25:28 -07:00
Mike Place
9738b6359f Merge pull request #37671 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2016-11-15 20:01:09 +13:00
Mike Place
bc65697502
Require network for npm tests 2016-11-15 12:45:17 +13:00
Ch3LL
acd4c3061e fix import for virtualbox test 2016-11-14 14:48:37 -07:00
rallytime
1b5f89577e Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/cloud/clouds/vmware.py
 2016-11-14 09:19:49 -07:00
rallytime
0e332ab591 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/cli/batch.py
  - salt/cli/salt.py
  - salt/transport/client.py
  - salt/utils/vmware.py
  - tests/integration/modules/sysmod.py
 2016-11-14 09:14:00 -07:00
Mike Place
305e51d1c0 Merge pull request #37625 from cachedout/issue_37492 
Return with proper retcodes in batch mode
 2016-11-12 20:29:09 +00:00
Mike Place
b14faf1c68 Merge pull request #37611 from jeanpralo/fix-cmd-batch-raw 
Fix cmd batch raw
 2016-11-11 15:53:58 +13:00
Mike Place
4fab707bdd Merge pull request #37627 from cachedout/pr-36706 
Exempt pip.iteritems from test_valid_docs test
 2016-11-11 15:48:37 +13:00
Mike Place
94df2f8e6f
Exempt pip.iteritems from test_valid_docs test 2016-11-11 15:47:43 +13:00
Jean Praloran
4f16840ef1 add integration test for salt.client.LocalClient.cmd_batch 2016-11-11 14:20:51 +13:00
Mike Place
b6031524e5
Return with proper retcodes in batch mode 
Check for the highest retcode received in batch mode and exit with it.

Also, an integration test for the same.

Closes #37492
 2016-11-11 14:03:29 +13:00