valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
75,168 Commits 24 Branches 182 Tags 341 MiB
9e206b67fa
Commit Graph

75168 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rallytime
ec7626d6ea Revert "Spelling fix: the module is named dockerng, not just docker." 
This reverts commit 94f72813c27299994e6522480bab760ca9f22878.
 2016-10-18 09:49:07 -06:00
rallytime
fe2a6dbc7f Spelling fix: the module is named dockerng, not just docker. 2016-10-18 09:49:07 -06:00
rallytime
a45b75cd9c Pylint fix: remove extra comma 2016-10-18 09:49:07 -06:00
rallytime
beed75ef39 Just use nested with statements so the test will work on all Pythons 2016-10-18 09:49:07 -06:00
rallytime
5e2f20ad37 Maintain two different tests for Py2 vs 3 in dockerng_test file 2016-10-18 09:49:07 -06:00
Mike Place
4b6838baf9 Fix Docker test for Py3 
Move to Py3-compat nested context manager approach.

Fix bug in thin generation where non-abs paths were not avoided.
 2016-10-18 09:49:07 -06:00
rallytime
b6628b9171 Merge branch 'carbon' into 'develop' 
No conflicts.
 2016-10-18 09:25:33 -06:00
rallytime
b8e215d358 Merge branch '2016.3' into 'carbon' 
No conflicts.
 2016-10-18 09:23:58 -06:00
Nicole Thomas
7ef10f6de6 Merge pull request #37072 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-10-18 09:23:17 -06:00
rallytime
78617b4a21 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - salt/cloud/clouds/profitbricks.py
  - salt/modules/cmdmod.py
  - salt/modules/file.py
 2016-10-18 09:22:18 -06:00
rallytime
78a144f19a Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-10-18 09:16:21 -06:00
Benoît Knecht
05b19fd369 states: glance: add disk_format to image_present (#37065) 
Images created by the glance.image_present had disk_format set to raw by
default, and there was no way to change that behavior. This is
particularly annoying because disk_format cannot be changed after the
image is created.

This commit adds a new disk_format property to glance.image_present that
will set the requested format when the image is created.
 2016-10-18 09:09:19 -06:00
Clint Armstrong
e732fe7725 fix docs on CSR state 2016-10-18 08:38:54 -04:00
Clint Armstrong
9b6f1a336c fix quotes and remove dependency on pkg_resources 2016-10-18 08:38:41 -04:00
George Mamalakis
caba4a0575 now indentation spaces are a multitude of four 2016-10-18 15:20:10 +03:00
Denys Havrysh
d1ab98b459 cp.get_url: update usage doc and add tests for file:// URL with dest=None 2016-10-18 13:39:55 +03:00
George Mamalakis
79f2dc6fa1 added support for keyword arguments (**kwargs) caching in decorators.memoize #36970 2016-10-18 13:07:53 +03:00
Nathan DELHAYE
a92408fa44 More lint fixes 2016-10-18 10:43:17 +02:00
Daniel Hobley
a133a2466e Allowed for specifying the scheme for powercfg 2016-10-18 09:49:07 +02:00
Mike Place
f54249f224 Merge pull request #37042 from oz123/document_py_renderer 
Improve the sparse docs on python renderer
 2016-10-18 16:20:48 +09:00
Mike Place
980ba892c9
Unify job check in scheduler 
Refs #35097
 2016-10-18 14:44:09 +09:00
Mike Place
00453da22e Merge pull request #36813 from sjmh/feature/stalekey 
Add stalekey engine
 2016-10-18 12:10:11 +09:00
Mike Place
968b9e8c2d Removed extra whitespace 2016-10-18 11:07:42 +09:00
Mike Place
202414c88b Merge pull request #37024 from gtmanfred/hashutil 
add the ability to verify github webhook hmac signatures
 2016-10-18 10:55:28 +09:00
Mike Place
71fd01ab8d Merge pull request #37049 from terminalmage/grains-docs 
Further clarification on new grains docs from #37028
 2016-10-18 10:47:57 +09:00
Mike Place
908383f37b Merge pull request #37051 from twangboy/fix_win_service_state_carbon 
Fix service state for Windows (Carbon)
 2016-10-18 10:38:48 +09:00
Mike Place
7dd91c2880 Merge pull request #37053 from rallytime/update-fedora-install-docs 
Update the Fedora installation docs
 2016-10-18 10:37:45 +09:00
Mike Place
9a6671ce69 Merge pull request #37057 from rallytime/cloud-utils-cleanup 
[2016.3] Update salt.utils.cloud references to __utils__ for cache funcs
 2016-10-18 10:31:43 +09:00
Mike Place
142afd1458 Merge pull request #37058 from rallytime/cloud-utils-cleanup-carbon 
[carbon] Update salt.utils.cloud references to __utils__ for cache funcs
 2016-10-18 10:31:20 +09:00
Nathan DELHAYE
20545f7155 Fix lint 2016-10-18 00:36:01 +02:00
Erik Johnson
f8cd7b7b28 Merge pull request #36977 from twangboy/fix_cmd_run 
Remove whitespace from string commands
 2016-10-17 17:32:03 -05:00
Nathan DELHAYE
516cea5b5d Add lxc.get_pid and lxc.add_veth 2016-10-18 00:26:02 +02:00
Erik Johnson
854586c6a4 Add one more paragraph 2016-10-17 17:20:57 -05:00
Erik Johnson
a0502a7b90 Restructure grain writing docs 
Some information recently added is a little redundant. This commit edits
it and restructures the information to make it flow better.
 2016-10-17 17:03:05 -05:00
rallytime
f610297e23 [carbon] Update salt.utils.cloud references to __utils__ for cache funcs 2016-10-17 14:54:02 -06:00
rallytime
2685045013 [2016.3] Update salt.utils.cloud references to __utils__ for cache funcs 
Follow up to #35483
 2016-10-17 14:49:36 -06:00
rallytime
d0dc7d4e55 [2016.3] Update salt.utils.cloud references to __utils__ for cache funcs 
Follow up to #35483
 2016-10-17 14:46:22 -06:00
Daniel Wallace
4eb0a89b7c remove options from pylint (#37054) 
These are going to be removed in pylint 1.6, and it doesn't appear that
we are using them, and just causes extra output.
 2016-10-17 14:24:25 -06:00
twangboy
b3b688e298 Fix tests 2016-10-17 13:31:55 -06:00
rallytime
24e0f5e024 Update the Fedora installation docs 
There are no packages available in EPEL starting with Salt version
2015.5.2 through 2016.3.2. Fedora packages are available in EPEL
starting with 2016.3.3. This PR adds a documentation note about this.
 2016-10-17 12:36:59 -06:00
twangboy
6586050736 Move strip to powershell block, add -NoProfile 2016-10-17 11:56:09 -06:00
twangboy
b4766e14a7 Add clarifying comment 2016-10-17 11:15:44 -06:00
twangboy
88da0df824 Set start to manual if disabled on service start 2016-10-17 11:12:08 -06:00
twangboy
1e1ee786c9 Set service to manual if disabled on start 2016-10-17 10:48:40 -06:00
Erik Johnson
4e419e90ac Further clarification on new grains docs from #37028 2016-10-17 11:44:35 -05:00
Nicole Thomas
9386697aee Merge pull request #37046 from rallytime/merge-develop 
[develop] Merge forward from carbon to develop
 2016-10-17 10:06:18 -06:00
Nicole Thomas
a48750395b Merge pull request #37047 from rallytime/merge-carbon 
[carbon] Merge forward from 2016.3 to carbon
 2016-10-17 10:06:00 -06:00
Nicole Thomas
9378b22d80 Merge pull request #37048 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-10-17 10:05:48 -06:00
rallytime
5efd6d3df9 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-10-17 09:10:26 -06:00
rallytime
41b248394f Merge branch '2016.3' into 'carbon' 
Conflicts:
  - salt/pillar/__init__.py
 2016-10-17 09:09:16 -06:00