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
75,926 Commits 24 Branches 182 Tags 341 MiB
a8a519c493
Commit Graph

75926 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Murphy
a8a519c493 Removed space for pylint 2017-02-08 12:42:14 -07:00
David Murphy
8fa0ffa427 Updates due to code review comments 2017-02-08 12:38:14 -07:00
David Murphy
97c59a8d1c Updated mount functionality for active on AIX 2017-02-08 12:38:14 -07:00
David Murphy
1a32b2cc89 Updated disk functionality for fstype, inodeuage and percent on AIX 2017-02-08 12:38:14 -07:00
Mike Place
99bfa7dfee Merge pull request #39233 from rallytime/fixup-more-doc-build-warnings 
Various doc updates to fix warnings in doc build
 2017-02-08 12:29:53 -07:00
Mike Place
59e927b520 Merge pull request #39237 from axmetishe/2016.11 
fix rds subnet group creation
 2017-02-08 12:04:30 -07:00
Evgeny Akhmetkhanov
6f4be8b69c fix rds subnet group creation 2017-02-07 15:46:31 -08:00
Nicole Thomas
84ff63875c [2016.11] Merge forward from 2016.3 to 2016.11 (#39234) 
* Fix for #38697

* Lint fixes

* Added missing source_hash_name argument in get_managed function
Additional fix to  #33187
Customer was still seeing errors, this should now work.
Tested with 2015.8.13 and 2016.11.2

* [2016.3] Pylint fix (#39202)

* Ignore empty dicts in highstate outputter

Closes #37174

* Sort the return list from the fileserver.envs runner

* Fix the win_ip_test failures (#39230)

The changes made in #38793 changes the "get_all_ointerfaces" call
to be a list of DNS servers. This change adjusts the tests structure
from a string to a list and fixes the test failure.
 2017-02-07 16:06:56 -07:00
Erik Johnson
fd3284f0c7 Put legacy git_pillar on a deprecation path for Oxygen (#39225) 
This adds a warning when legacy git_pillar is used, and a notice in the
docs.
 2017-02-07 11:18:28 -07:00
Mike Place
19c3d90a32 Merge pull request #39180 from morganwillcock/setup 
setup.py: Remove global options from install command
 2017-02-07 09:20:48 -07:00
C. R. Oldham
a0907bc861 Merge pull request #38863 from hujunya/fix_django_auth 
fix django auth not work
 2017-02-07 09:42:59 -06:00
Junya Hu
2a99ff46d3 check if django_auth_path has been in sys.path 2017-02-07 15:08:51 +08:00
rallytime
2f74dcf685 Various doc updates to fix warnings in doc build 2017-02-06 16:56:58 -07:00
Nicole Thomas
c3e541e0a2 Merge pull request #39198 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2017-02-06 14:01:56 -07:00
C. R. Oldham
2a85d73f59 Merge pull request #39063 from cloudflare/ISS-39059 
Avoid KeyError: 'multiprocessing' in the master logs
 2017-02-06 13:37:34 -06:00
rallytime
7ea5f7f82f Merge branch '2016.3' into '2016.11' 
No conflicts.
 2017-02-06 12:33:52 -07:00
Mike Place
91c25bd651 Merge pull request #39083 from lomeroe/bp-36336 
Backport #36336 to 2016.11
 2017-02-06 11:50:52 -07:00
Mike Place
30455079fe Merge pull request #39153 from nicholasmhughes/fix-selinux.mode-config-predictability 
Fix selinux.mode state config file handling
 2017-02-06 11:37:34 -07:00
Mike Place
7b5eb17cbe Merge pull request #39159 from clinta/csr-crl-passphrase 
Csr crl passphrase
 2017-02-06 11:36:05 -07:00
Mike Place
b240468525 Merge pull request #39162 from meaksh/snapper-module-improvements 
Adding more function to Snapper module
 2017-02-06 11:33:52 -07:00
Mike Place
fa45cbc359 Merge pull request #39166 from Ch3LL/fix_boto_ec2_docs 
fix boto ec2 module create_image doc
 2017-02-06 11:27:16 -07:00
Mike Place
6f9251ebed Merge pull request #39171 from techhat/issue38370 
Raise an error for a disk size that is too small
 2017-02-06 11:19:45 -07:00
Mike Place
a40cb46249 Merge pull request #39173 from rallytime/restore-community-docs 
Restore "Salt Community" doc section
 2017-02-06 11:19:10 -07:00
Mike Place
036f36dc9b Merge pull request #39179 from mcalmer/fix-dockerng-error-parsing 
fix error parsing
 2017-02-06 10:56:59 -07:00
Mike Place
30f83156cb Merge pull request #39189 from morganwillcock/sockstat 
Fix NetBSD sockstat parsing
 2017-02-06 10:28:07 -07:00
nicholasmhughes
8d8ba9c7d2 added the new getconfig function to the test 2017-02-06 09:55:09 -05:00
Morgan Willcock
344d13eff5 Fix NetBSD sockstat example 2017-02-06 11:38:34 +00:00
Morgan Willcock
64b693195c Fix NetBSD sockstat parsing 
Fixes NetBSD sockstat parsing so that presence events are fired correctly.
 2017-02-06 11:08:31 +00:00
Morgan Willcock
d7e05091a2 Remove global options from Install 2017-02-04 19:00:36 +00:00
Michael Calmer
6750ccd78e fix error parsing 2017-02-04 16:05:45 +01:00
rallytime
5aeddf42a0 Restore "Salt Community" doc section 
This was moved to the `topics/index.rst` page in PR #10792, but
seems to have been accidentally removed in PR #30770.
 2017-02-03 16:43:04 -07:00
Joseph Hall
ec57a39c00 Typo 2017-02-03 14:27:45 -07:00
Joseph Hall
2ed2932387 Clean up debug logs 2017-02-03 14:24:51 -07:00
Joseph Hall
671282656a Raise an error for a disk size that is too small 2017-02-03 14:21:59 -07:00
Thomas S Hatch
6a9704189f Merge pull request #39141 from UtahDave/fix_cache_lookup_ZD1187 
Don't overwrite the minion_ids var that was passed
 2017-02-03 13:56:24 -07:00
Nicole Thomas
d19cee716f Merge pull request #39164 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2017-02-03 10:57:06 -07:00
Ch3LL
90af696331 fix boto ec2 module create_image doc 2017-02-03 10:23:12 -07:00
Mike Place
ed12512045 Merge pull request #39152 from twangboy/win_installer 
Remove files not needed by salt-minion
 2017-02-03 10:11:10 -07:00
Mike Place
cf548ac717 Remove unnecessary pass 2017-02-03 09:54:02 -07:00
Mike Place
4ebf7a3df4 Remove unnecessary pass statement 2017-02-03 09:53:08 -07:00
rallytime
6504bb6b02 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/modules/pillar.py
  - salt/states/archive.py
  - tests/integration/states/archive.py
 2017-02-03 09:48:58 -07:00
Erik Johnson
9de08af950 Apply fix from #38705 to 2016.3 branch (#39077) 
* Apply fix from #38705 to 2016.3 branch

This is a better fix and covers more use cases than the sudo_user one.

* Remove saltenv param from internal state func call

This was probably redundant in the first place, but since state.sls,
state.highstate, etc. accept a saltenv param and the actual state
functions do not, this results in multiple values passed for the saltenv
param.

Remove this argument and let file.get_managed reference __env__
internally.

* Update archive tests to match 2016.11 branch
 2017-02-03 09:35:49 -07:00
Pablo Suárez Hernández
f950732fa0 pylint fixes 2017-02-03 16:28:42 +00:00
Daniel Wallace
da3053ea9b update vmware getting started doc (#39146) 
The IDE entry needs to be a dictionary entry.  Without this, it is seen
as a string.  This is probably done this way so that in the future,
configurations can be added to the IDE device.
 2017-02-03 09:00:00 -07:00
Pablo Suárez Hernández
aa2f9906e0 Removing extra spaces 2017-02-03 15:41:59 +00:00
Pablo Suárez Hernández
9d6a33f257 Adds 'snapper.create_config' unit tests 2017-02-03 15:41:58 +00:00
Pablo Suárez Hernández
d38ed505f8 Adds 'snapper.modify_snapshots' unit tests 2017-02-03 15:41:29 +00:00
Pablo Suárez Hernández
d5496ccc99 Adds 'snapper.delete_snapshots' unit tests 2017-02-03 15:41:29 +00:00
Pablo Suárez Hernández
3eecb6076b Snapper: Adding support for creating configurations 2017-02-03 15:41:29 +00:00
Pablo Suárez Hernández
041e54d42a Snapper: Adding support for snapshot metadata modification 2017-02-03 15:41:29 +00:00