valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 00:55:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
65,001 Commits 24 Branches 182 Tags 341 MiB
c71756ab46
Commit Graph

65001 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joseph Hall
c71756ab46 Disable VNC by default 2016-01-28 11:59:04 -07:00
Nicole Thomas
67b20728d2 Merge pull request #30709 from michalsuba/patch-2 
exposing name of password column from module
 2016-01-28 11:26:37 -07:00
Nicole Thomas
604cef23c1 Merge pull request #30708 from michalsuba/patch-1 
Addressing user creation on mysql 5.7
 2016-01-28 11:25:42 -07:00
Michal Suba
727c1384bd exposing name of password column from module 
in addition to https://github.com/saltstack/salt/pull/30603
and https://github.com/saltstack/salt/pull/30708
 2016-01-28 18:48:26 +01:00
Michal Suba
6a115f271c Addressing user creation on mysql 5.7 
After creating user on mysql 5.7, check fails. This should work in addition to changes mentioned in  https://github.com/saltstack/salt/issues/29265 .
 2016-01-28 18:40:15 +01:00
Nicole Thomas
1329d21dc0 Merge pull request #30702 from kraney/boto_s3_bucket 
Further fix for #30544
 2016-01-28 09:32:48 -07:00
Nicole Thomas
43be48ae78 Merge pull request #30693 from ankitforcode/fix_volume_creation_amazon_boto_lc 
Updated Documentation and Example for creating volume in launch_config when using boto
 2016-01-28 09:06:20 -07:00
Kris Raney
9f7034ae35 Further fix for #30544 
When versioning is unspecified, still had an error for brand new buckets.
 2016-01-28 09:37:05 -06:00
ankitforcode
9f2a68d99b Updated Documentation and Example for creating volume in launch_config when using boto 2016-01-28 14:49:35 +05:30
Colton Myers
642bc65e9f Merge pull request #30683 from s0undt3ch/issues/py26-deepcopy-fix 
Allow deepcopies of NamespacedDictWrapper in python 2.6
 2016-01-27 16:59:04 -07:00
Colton Myers
9b28b09fde Merge pull request #30634 from MorphBonehunter/develop 
Renaming salt-ssh option and documentation fix
 2016-01-27 16:50:11 -07:00
Colton Myers
00983b809b Merge pull request #30660 from invsblduck/revert_issue_21084 
Revert service.mod_watch() bug introduced in Issue 21084
 2016-01-27 15:49:37 -07:00
Colton Myers
0ee078eaf1 Merge pull request #30647 from terminalmage/issue11304 
Allow custom types to sync to the master
 2016-01-27 15:35:01 -07:00
Daniel Wendler
32b71239e7 Extend deprecation warning until Nitrogen 
Show the wipe_ssh deprecation warning until Nitrogen is released.
 2016-01-27 22:50:14 +01:00
Colton Myers
c15999edd9 Merge pull request #30428 from davisj/pillar_cache 
Add pillar_cache functionality to minion.
 2016-01-27 14:28:08 -07:00
Erik Johnson
36cd3f3c4c Revert saltenv='base' changes 
These were unintentional.
 2016-01-27 15:14:31 -06:00
Colton Myers
127455ac17 Merge pull request #30571 from jizhilong/add/ttl_redis_return 
implement clean_old_jobs for redis returner
 2016-01-27 14:11:18 -07:00
Erik Johnson
1aa7c611c8 Add additional clarification re: saltutil runner to boron release notes 2016-01-27 15:10:06 -06:00
Colton Myers
4941b268f2 Merge pull request #30632 from twangboy/mac_system 
Mac system
 2016-01-27 14:06:52 -07:00
Pedro Algarvio
69c0f46891 Allow deepcopies of NamespacedDictWrapper in python 2.6 2016-01-27 19:23:36 +00:00
Nicole Thomas
5d81fa39f0 Merge pull request #30669 from The-Loeki/patch-1 
BCache module: Updates to documentation & small fix
 2016-01-27 10:57:36 -07:00
Nicole Thomas
c5bd513820 Merge pull request #30670 from The-Loeki/patch-2 
SysFS module documentation updates
 2016-01-27 10:20:19 -07:00
Nicole Thomas
de81a85e73 Merge pull request #30668 from multani/fix/docs 
Fix salt.modules.mount documentation
 2016-01-27 10:18:43 -07:00
Nicole Thomas
9cece0e9ec Merge pull request #30665 from techhat/fixevent 
Add default for __opts__['local']
 2016-01-27 10:12:08 -07:00
Ronald van Zantvoort
36b1fd9893 BCache: small fix in detection data on candidate cache device 2016-01-27 17:56:03 +01:00
Ronald van Zantvoort
8004920004 SysFS doc lint fixes 2016-01-27 17:38:49 +01:00
Ronald van Zantvoort
e753769f47 lint fixy 2016-01-27 17:22:55 +01:00
Ronald van Zantvoort
c660cf8e64 SysFS module documentation updates 2016-01-27 17:08:06 +01:00
Ronald van Zantvoort
1683eac8be BCache module: Updates to documentation 2016-01-27 16:54:48 +01:00
Joseph Hall
b2a15ca8d4 Add default for __opts__['local'] 2016-01-27 08:04:25 -07:00
Jonathan Ballet
687a15320c Fix salt.modules.mount documentation 2016-01-27 15:57:10 +01:00
Daniel Wendler
c7973f6713 Add backward compatibility for wipe_ssh 
Added an check for the deprecated config option wipe_ssh and print
an warning about the deprecation.
 2016-01-27 09:40:11 +01:00
Brett Campbell
0cc31a00d6 Revert service.mod_watch() bug introduced in Issue 21084 
This reverts commits 61ed479 and dd60432, which blatantly break
`test=True' protections.

The code should be reverted for the following reasons:

    1. The block of code modified relates *purely* to variable assignment
       only--it determines which action will be taken _after_ the `test'
       option is checked. This block of code represents over 60% of the
       function and is for reconnaissance/assignment only.
    2. The change was originally made because a sysv init script didn't
       support the `status' argument; the correct way to work around
       this in salt is by passing the `sig' argument into the service
       state (as seen in Issue 7614, which was closed for this reason).
 2016-01-26 16:37:48 -08:00
Nicole Thomas
6ce6b21990 Merge pull request #30655 from rallytime/merge-forward-develop 
[develop] Merge 2015.8 into develop
 2016-01-26 17:33:20 -07:00
Erik Johnson
5b48362adb Improve docstrings and instructions on how to sync 
This also removes an unused argument from salt.modules.saltutil.sync_sdb().
 2016-01-26 17:48:12 -06:00
rallytime
4fa80f2d5e Merge branch '2015.8' into 'develop' 
Conflicts:
  - doc/ref/states/all/index.rst
  - salt/cloud/__init__.py
  - salt/minion.py
  - salt/modules/file.py
  - salt/modules/guestfs.py
  - salt/modules/ipmi.py
  - salt/modules/osquery.py
  - salt/modules/parted.py
  - salt/modules/seed.py
  - salt/modules/virt.py
  - salt/modules/yumpkg.py
  - salt/modules/zypper.py
  - salt/states/boto_elb.py
  - salt/states/pkg.py
 2016-01-26 16:19:39 -07:00
Nicole Thomas
d6e2c7aa82 Merge pull request #30614 from techhat/depimg 
WIP: Deprecate salt/modules/img.py
 2016-01-26 15:03:11 -07:00
twangboy
6b88a11157 Fixed _validate_enabled function 2016-01-26 14:10:38 -07:00
twangboy
407f2e539e Applied Colton's suggestions 2016-01-26 14:03:23 -07:00
Erik Johnson
89468f886c Add versionadded directive 2016-01-26 15:03:11 -06:00
Erik Johnson
385e216aa1 Add function to sync queues to saltutil runner 2016-01-26 15:02:46 -06:00
Erik Johnson
d3da641f58 Add function to sync engines to saltutil runner 2016-01-26 14:58:00 -06:00
Erik Johnson
adaf3625c2 Add extension_modules change to Boron release notes 2016-01-26 14:41:39 -06:00
Erik Johnson
dcf5ed6369 Add information about change to extention_modules 2016-01-26 14:41:39 -06:00
Erik Johnson
c93b693f4c Add saltutil runner to docs toctree 2016-01-26 14:41:39 -06:00
Erik Johnson
bbf86a7e4b Add saltutil runner module 2016-01-26 14:41:39 -06:00
Erik Johnson
b51d43e76f Use salt.utils.extmods.sync() in saltutil execution module 2016-01-26 14:41:39 -06:00
Erik Johnson
78991e2d08 Add extmods submodule to utils 
This will allow the master to sync custom types
 2016-01-26 14:41:39 -06:00
Nicole Thomas
30e03a8b0c Merge pull request #30644 from tbaker57/another_go_at_30573 
Another go at fixing 30573
 2016-01-26 13:18:41 -07:00
Erik Johnson
ccf5b0cfae Move default master extension_modules dir within master cachedir 2016-01-26 14:17:03 -06:00