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
73,056 Commits 24 Branches 182 Tags 341 MiB
a37f250460
Commit Graph

73056 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
twangboy
a37f250460 Fix a few more tests for Windows 2016-08-29 14:53:41 -06:00
twangboy
85fc2f1adc Fix test_absent_link, test_managed_contents 2016-08-29 14:53:41 -06:00
twangboy
aafe1aff38 Create missing source for symlink on windows 2016-08-29 14:53:41 -06:00
twangboy
c9acbfee38 Fix jinja 2016-08-29 14:53:41 -06:00
twangboy
cd2ce9fb01 Use Jinja instead of seperate files 2016-08-29 14:53:41 -06:00
twangboy
ba2047e37b Fix a few more tests 2016-08-29 14:53:41 -06:00
twangboy
64ca61065d Use IS_WINDOWS instead of salt.utils.is_windows 2016-08-29 14:53:41 -06:00
twangboy
b647630dd3 Add missing @ on decorators 2016-08-29 14:53:41 -06:00
twangboy
56180cf09d Fix/Skip tests for windows 2016-08-29 14:53:41 -06:00
twangboy
4d4ffac5ae Gate stuff that makes windows crash 2016-08-29 14:53:41 -06:00
David Boucha
822b0a0f33 Don't test for linux shells on Windows (#35743) 
* Don't test for linux shells on Windows

* Don't force windows to be false

Salt didn't used to support runas on Windows.
Salt now supports runas on Windows. This line was causing the wrong code
paths to be followed.

* Skip test on windows because no VT on windows

* add missing closing paren
 2016-08-26 12:52:39 -06:00
Nicole Thomas
e517da9e80 Bump the deprecation warning in pkgrepo state to Nitrogen (#35806) 
Let's give users a little more time to update their states given
the issues found in #33536 that were fixed recently by #35055.
 2016-08-26 10:43:00 -06:00
Nicole Thomas
457e857981 Bump the deprecation warnings in glance module to Nitrogen (#35805) 2016-08-26 10:42:36 -06:00
Nicole Thomas
50f4d51628 Bump the deprecation warning in salt.client.mixins.py to Nitrogen (#35804) 2016-08-26 10:42:22 -06:00
Nicole Thomas
f973cf4fa3 Merge pull request #35785 from rallytime/merge-develop 
[develop] Merge forward from 2016.3 to develop
 2016-08-26 09:31:12 -06:00
rallytime
6464236f68 Merge branch '2016.3' into 'develop' 
Conflicts:
  - doc/conf.py
  - doc/ref/returners/index.rst
  - salt/states/disk.py
 2016-08-25 16:09:01 -06:00
Nicole Thomas
6784cb036d Implement suggestions of bytes vs str type for #35593 (#35783) 
* Implement suggestions of bytes vs str type for #35593

Refs #35593

* Str, not bytes
 2016-08-25 15:45:51 -06:00
Mike Place
89bf5cf250 Developer documentation for Unicode handling (#35593) 
* Developer documentation for Unicode handling

* Clarifications
 2016-08-25 15:30:31 -06:00
Nicole Thomas
9b5ee2155e Merge pull request #35763 from isbm/isbm-doc-conf-sphinx-crashfix 
Sphinx crash: documentation config fix
 2016-08-25 15:12:38 -06:00
Nicole Thomas
b8692db9f3 Bump template context deprecation to Nitrogen (#35776) 2016-08-25 14:35:44 -06:00
Nicole Thomas
cd90052187 Documentation spelling fixes (#35773) 
Fixes #35771
 2016-08-25 13:41:03 -06:00
Nicole Thomas
816f8e8d0a Merge pull request #35768 from rallytime/merge-develop 
[develop] Merge forward from 2016.3 to develop
 2016-08-25 12:01:47 -06:00
Nicole Thomas
0546b76d63 Revert "Template context must be populated with key:value pairs" (#35770) 2016-08-25 11:31:04 -06:00
rallytime
381debe53b Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/fileclient.py
  - salt/loader.py
 2016-08-25 10:14:38 -06:00
Nicole Thomas
e355c1cf90 Merge pull request #35767 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-08-25 10:09:37 -06:00
rallytime
8ad6a12c80 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - doc/conf.py
 2016-08-25 10:08:52 -06:00
Thomas S Hatch
b3f6367621 Merge pull request #35753 from rallytime/fix-client-unit-test 
Fixup the unit.client_test.LocalClientTestCase.test_cmd_subset from #35720
 2016-08-25 09:55:23 -06:00
Nicole Thomas
197605ad91 Merge pull request #35735 from rallytime/merge-develop 
[develop] Merge forward from 2016.3 to develop
 2016-08-25 09:43:35 -06:00
Bo Maryniuk
a56ae4e8f5 Configure importing Mock to handle 'total' method from psutils properly 2016-08-25 16:48:34 +02:00
Bo Maryniuk
9c057d0266 Return psutil back to the list of mocked imports 2016-08-25 16:47:59 +02:00
Bo Maryniuk
3d7758461e Improve Mock to be flexible and able to mock methods from the mocked modules 2016-08-25 16:47:08 +02:00
rallytime
92f8c836e8 Add cmd_mock back in to function spec 2016-08-25 07:05:52 -06:00
rallytime
a671f0a092 Fixup the unit.client_test.LocalClientTestCase.test_cmd_subset from #35720 
Refs #35720
 2016-08-24 17:48:45 -06:00
Nicole Thomas
dab8428c01 Add versionadded for enabled function in apache_module state (#35732) 
Refs #35458
 2016-08-24 13:49:11 -06:00
Nicole Thomas
bab0e3d449 Merge pull request #35737 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-08-24 13:48:45 -06:00
Jacob Hammons
2a12795bac Fixes Windows download paths (#35742) 2016-08-24 13:38:17 -06:00
rallytime
61e37d5956 Merge branch '2015.8' into '2106.3' 
Conflicts:
  - salt/loader.py
  - salt/modules/s3.py
  - salt/utils/s3.py
  - tests/unit/modules/s3_test.py
 2016-08-24 09:58:56 -06:00
rallytime
748b5956b4 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/engines/sqs_events.py
  - salt/utils/gitfs.py
 2016-08-24 09:50:40 -06:00
Mike Place
7877ff1d5e Merge pull request #35729 from cachedout/fix_docs_build 
Remove docs mocks for msgpack and psutils
 2016-08-24 23:42:05 +09:00
Mike Place
fdbf01d5ad Remove docs mocks for msgpack and psutils 
Also make docs build py3 compat
 2016-08-24 22:55:11 +09:00
Mike Place
bd0790f5f7 Merge pull request #35374 from cachedout/issue_34434 
Allow for additional module validation functions.
 2016-08-24 17:32:54 +09:00
Mike Place
fa89917cd1 Merge pull request #35608 from eradman/no_top_contents 
Provide useful hints for error "No contents found"
 2016-08-24 17:18:49 +09:00
Mike Place
962e493304 Merge pull request #35628 from jf/fix_user.present_reporting_when_remove_groups=false 
Fix user.present state reporting for groups when remove_groups=false
 2016-08-24 17:15:30 +09:00
Mike Place
6e3e52a517 Merge pull request #35644 from xiaoanyunfei/patch-2 
Fix salt-syndic's log_level not consistent with salt-master​
 2016-08-24 17:12:42 +09:00
Mike Place
248776d704 Merge pull request #35655 from raazvvann/dev/rheghedu/shadow 
shadow module: fix return values && integration test
 2016-08-24 17:12:02 +09:00
Mike Place
935f8ebe9f Merge pull request #35666 from lyft/default-asg-termination-policy 
Add the ability to set default ASG termination policies in a pillar.
 2016-08-24 17:06:49 +09:00
Mike Place
e3bd42587e Merge pull request #35690 from DSRCorporation/bugs/35570_local_mode_for_run_and_key 
Return back local mode for salt-run and salt-key if not eauth.
 2016-08-24 17:04:37 +09:00
Mike Place
02d86c6550 Merge pull request #35696 from xiaoanyunfei/2016.3 
fix maximum recursion depth bug
 2016-08-24 17:01:16 +09:00
Mike Place
fea249c40c Merge pull request #35698 from kraney/boto_vpc_bugfix 
boto_vpc's delete_nat_gateway fails to remove elastic IPs associated with the NAT gatewa
 2016-08-24 16:47:32 +09:00
Mike Place
06a75be8bd Merge pull request #35701 from gtmanfred/2015.8 
use aws.get_location in s3 modules
 2016-08-24 16:46:30 +09:00