valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
85,477 Commits 24 Branches 182 Tags 341 MiB
b9b5181046
Commit Graph

85477 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nicole Thomas
390ea9e2da Merge pull request #43065 from wcannon/develop 
saltcheck module
 2017-09-01 11:48:24 -04:00
Nicole Thomas
cf2b75bb86 Merge pull request #43265 from gtmanfred/2017.7 
make sure meta-data grains work on ec2
 2017-09-01 11:31:12 -04:00
Nicole Thomas
618b221895 Merge pull request #43299 from twangboy/win_fix_netapi_cherrypy 
Fix `unit.netapi.rest_cherrypy.test_tools` for Windows
 2017-09-01 11:13:42 -04:00
Nicole Thomas
fd74acb603 Merge branch '2017.7' into win_fix_netapi_cherrypy 2017-09-01 09:10:51 -04:00
Nicole Thomas
aee654da92 Merge pull request #43300 from twangboy/win_fix_netapi_rest_tornado 
Fix `unit.netapi.rest_tornado.test_handlers` for Windows
 2017-09-01 09:10:10 -04:00
twangboy
c93d2ed386 Use os.sep instead of '/' 2017-08-31 17:01:14 -06:00
twangboy
3fbf24b91a Use os.sep instead of '/' 2017-08-31 16:56:58 -06:00
Dmitry Kuzmenko
3ad6911210 Fix for tests: don't require 'groups' in the eauth token. 2017-08-31 20:39:35 +03:00
Nicole Thomas
0d1b715b97 Merge pull request #43236 from akurach/patch-1 
Update __init__.py
 2017-08-31 11:25:31 -04:00
Nicole Thomas
d1e59e752d Merge pull request #43281 from brejoc/fix_for_install_time_rh2 
Checking install_time for '(none)' value
 2017-08-31 10:19:07 -04:00
wcannon
2a484fc46f Merge branch 'develop' into develop 2017-08-31 09:01:41 -05:00
Dmitry Kuzmenko
1f104cf85b Fix ldap token groups auth. 2017-08-31 16:52:44 +03:00
Nicole Thomas
46cd87d815 Merge pull request #43225 from lomeroe/fix_43166_develop 
fix issues in PR #43116
 2017-08-31 09:43:56 -04:00
Nicole Thomas
aed2975979 Merge pull request #43278 from gtmanfred/virtualbox 
bootstrap can come from dunders
 2017-08-31 09:31:19 -04:00
Jochen Breuer
7aeed33575
Checking install_time for '(none)' value 
RedHat systems might in some cases return '(none)' as install_time,
which would cause a ValueError.

We are checking for '(none)' now. install_date and install_date_time
are being set to None in that case.
 2017-08-31 09:48:07 +02:00
Daniel Wallace
c4ae2de30f bootstrap can come from dunders 2017-08-30 20:38:50 -06:00
William Cannon
58eef3dc2c fixed dunder usage problem in unit test 2017-08-30 17:00:27 -05:00
wcannon
c080b263d5 Merge branch 'develop' into develop 2017-08-30 15:54:57 -05:00
William Cannon
a3bbe160fc uncommented salt.utils import 2017-08-30 15:45:46 -05:00
Nicole Thomas
654ff158b9 Merge pull request #43248 from treba123/patch-3 
Add **kwargs to some file states
 2017-08-30 16:30:27 -04:00
Nicole Thomas
479e0e06ac Merge pull request #42975 from brejoc/tests-for-kubernetes-module 
Added unit tests for Kubernetes module
 2017-08-30 16:30:15 -04:00
Nicole Thomas
ca7df1d4cf Merge pull request #43176 from terminalmage/issue42935 
docker_image states: Handle Hub images prefixed with "docker.io/"
 2017-08-30 16:08:13 -04:00
Nicole Thomas
b72718ee82 Merge pull request #42811 from hibbert/allow_creation_token_boto_efs/develop 
develop: Allow creation_token to be passed into create_file_system an…
 2017-08-30 16:02:18 -04:00
Nicole Thomas
e2f4d5b1bf Merge pull request #43243 from treba123/patch-1 
Add **kwargs to mount.mounted state
 2017-08-30 16:01:52 -04:00
Nicole Thomas
0bf860ad1d Merge pull request #43245 from treba123/patch-2 
Add **kwargs to salt.state state
 2017-08-30 15:40:15 -04:00
Nicole Thomas
237e5ce697 Merge pull request #43250 from rallytime/utils-path-fixes 
Update some salt.utils.x paths for moved util functions
 2017-08-30 15:09:02 -04:00
Nicole Thomas
7c979c8e17 Merge pull request #43264 from mkoderer/fix_bigip_doc 
Fix bigip documentation for delete_pool_member
 2017-08-30 15:07:20 -04:00
Nicole Thomas
fdad9177b5 Merge branch '2017.7' into tests-for-kubernetes-module 2017-08-30 14:47:37 -04:00
Nicole Thomas
26ff8088cb Merge pull request #43266 from gtmanfred/virtualbox 
switch virtualbox cloud driver to use __utils__
 2017-08-30 14:36:19 -04:00
Nicole Thomas
ee209b144c Merge pull request #43073 from Mapel88/patch-2 
Fix bug #42936 - win_iis module container settings
 2017-08-30 14:34:36 -04:00
Daniel Wallace
382bf92de7 switch virtualbox cloud driver to use __utils__ 2017-08-30 10:29:48 -06:00
rallytime
f8b025f6dc Merge branch '2016.11' into '2017.7' 
Conflicts:
  - salt/modules/win_pkg.py
 2017-08-30 12:18:19 -04:00
rallytime
14f5e5e023 Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/modules/augeas_cfg.py
  - salt/modules/inspectlib/collector.py
 2017-08-30 12:16:28 -04:00
Timur
047ad07da4 .utils.aws.get_location() expects a dict 
… as it's `provider` argument.
 2017-08-30 12:12:36 -04:00
Nicole Thomas
523c10a4df Merge branch 'develop' into allow_creation_token_boto_efs/develop 2017-08-30 12:05:21 -04:00
Nicole Thomas
a972c4fb8c Merge pull request #42840 from StreetHawkInc/update_azurearm 
Update salt-cloud azurearm to work with latest sdk
 2017-08-30 12:01:34 -04:00
Robert Mader
fe457a806a Merge branch 'develop' into patch-1 2017-08-30 17:54:21 +02:00
Robert Mader
f38dc9bf1a Merge branch 'develop' into patch-2 2017-08-30 17:54:03 +02:00
Robert Mader
b8db277e51 Merge branch 'develop' into patch-3 2017-08-30 17:53:50 +02:00
Nicole Thomas
ec1bedc646 Merge pull request #43254 from twangboy/win_fix_test_inspect_collector 
Fix `unit.modules.test_inspect_collector` on Windows
 2017-08-30 11:46:07 -04:00
Daniel Wallace
04dd8ebedb make sure meta-data grains work on ec2 
We need to add on '/' for the end of the directories under latest.

Then we should load anything that appears that we can that is json.  The try
except block is slightly faster than checking if the line starts with '{'
 2017-08-30 09:05:34 -06:00
Nicole Thomas
4241816423 Merge pull request #43237 from timka/patch-2 
.utils.aws.get_location() expects a dict
 2017-08-30 10:48:17 -04:00
Nicole Thomas
1fc7307735 Merge pull request #43255 from gtmanfred/2017.7 
always return a dict object
 2017-08-30 10:47:14 -04:00
Nicole Thomas
0798d851d2 Merge pull request #43210 from m03/add-aptly-exec-module 
Add aptly execution module
 2017-08-30 10:29:26 -04:00
Nicole Thomas
97f91ef8f2 Merge branch 'develop' into fix_43166_develop 2017-08-30 10:27:51 -04:00
Nicole Thomas
fa904ee225 Merge pull request #43229 from twangboy/win_fix_pkg.install-2017.7 
Bring changes from #43228 to 2017.7
 2017-08-30 10:26:55 -04:00
Marc Koderer
784a5ca036 Fix bigip documentation for delete_pool_member 
Signed-off-by: Marc Koderer <marc.koderer@sap.com>
 2017-08-30 16:26:26 +02:00
Nicole Thomas
3a0b02f3ae Merge pull request #43228 from twangboy/win_fix_pkg.install 
Win fix pkg.install
 2017-08-30 10:26:21 -04:00
Nicole Thomas
f6926bf95c Merge branch 'develop' into patch-1 2017-08-30 10:20:11 -04:00
Nicole Thomas
fbfbe31687 Lint: use salt.utils.versions instead of distutils.version for LooseVersion 2017-08-30 10:02:39 -04:00