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
81,912 Commits 24 Branches 182 Tags 341 MiB
4f3b06dfb8
Commit Graph

81912 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexandru Bleotu
4f3b06dfb8 Added private function to adjust the log_file path if there is a log_dir override 2017-05-17 17:21:14 +01:00
Mike Place
8f9ed2be5a Merge pull request #41280 from shorawitz/patch-4 
Update boto_cfn.py
 2017-05-16 17:20:50 -05:00
Nicole Thomas
1e78c3c2ba Merge pull request #41259 from rallytime/follow-up-41245 
Remove doc ref files for search runner
 2017-05-16 15:50:38 -06:00
Nicole Thomas
ded62babe2 Merge pull request #41253 from rallytime/update-permersionerror 
Use python 2 compatible error numbers instead of PermissionError
 2017-05-16 15:23:51 -06:00
David Christensen
1778cf7c94 Update boto_cfn.py 
Added ability to return "tags" and "parameters" from Amazon Cloud Formation
 2017-05-16 09:03:22 -07:00
Erik Johnson
12a768fd91 Merge pull request #41251 from abednarik/update_apt_hold_docs 
Update apt module regarding upgrade against hold packages.
 2017-05-16 09:38:54 -05:00
Nicole Thomas
cf51b6a037 Merge pull request #41257 from rallytime/merge-develop 
[develop] Merge forward from nitrogen to develop
 2017-05-15 17:40:05 -06:00
rallytime
2690a36cb8 Remove doc ref files for search runner 
The search runner and related code was removed in #41245
 2017-05-15 16:48:21 -06:00
Nicole Thomas
631c541485 Merge pull request #41245 from thatch45/develop 
Remove Salt Search system, this never worked
 2017-05-15 16:45:24 -06:00
rallytime
bde9d6cdc0 Merge branch 'nitrogen' into 'develop' 
No conflicts.
 2017-05-15 16:29:13 -06:00
Nicole Thomas
9290435745 Merge pull request #41223 from rallytime/merge-nitrogen 
[nitrogen] Merge forward from 2016.11 to nitrogen
 2017-05-15 16:13:33 -06:00
Nicole Thomas
cbe6d00513 Merge pull request #41204 from twangboy/fix_pub_win 
Increase timeout for Windows
 2017-05-15 14:04:33 -06:00
rallytime
8ee4bbb8eb Add "conf_file" to ADDITIONAL_OPTS for pillar integration tests 2017-05-15 13:52:07 -06:00
Nicole Thomas
bad9e14b94 Merge pull request #41227 from whiteinge/rest_cherrypy-performance-expectations 
rest_cherrypy performance expectations docs
 2017-05-15 13:27:46 -06:00
Nicole Thomas
d6af99cc99 Merge pull request #41248 from DSRCorporation/bugs/py3_tests_nitrogen 
Py3: Fixed timezone test.
 2017-05-15 13:27:19 -06:00
Thomas S Hatch
5f01ab2e68 remove search refs 2017-05-15 13:17:25 -06:00
rallytime
62b2fd9857 Use python 2 compatible error numbers instead of PermissionError 
The [PermissionError](https://docs.python.org/3.4/library/exceptions.html#PermissionError)
exception is new to PY 3. We need to use something that will work both in
Python 2 and Python 3.

Refs #41249
 2017-05-15 12:43:36 -06:00
Nicole Thomas
52c50f068d Merge pull request #41238 from sebw/sebw-mine-doc 
Documentation fix: mine.get compound example
 2017-05-15 12:19:48 -06:00
Erik Johnson
409a16c5f1 Merge pull request #41206 from skizunov/develop2 
opkg may return non-zero but empty stderr
 2017-05-15 13:15:42 -05:00
Nicole Thomas
064d51e717 Small grammar fixes 2017-05-15 12:08:50 -06:00
abednarik
3d215d32bd Update apt module regarding upgrade against hold packages. 
Fixes #41231 and related to #30777.
 2017-05-15 14:15:22 -03:00
Mike Place
5af528f00f Merge pull request #41249 from DSRCorporation/bugs/py3_tests 
Do not fail to init grains for non-root user.
 2017-05-15 12:04:30 -05:00
Mike Place
5a8cec17c2 Merge pull request #41207 from amendlik/kernelpkg 
kernelpkg updates
 2017-05-15 11:56:56 -05:00
Mike Place
3fec29482d Merge pull request #41164 from miromode/patch-1 
ret_config and ret_kwargs in orchestration
 2017-05-15 11:55:48 -05:00
Dmitry Kuzmenko
65be90ef21 Do not fail to init grains for non-root user. 2017-05-15 19:45:23 +03:00
Dmitry Kuzmenko
b10730d8a1 Py3: Fixed timezone test. 2017-05-15 19:40:57 +03:00
Thomas S Hatch
ee3c5d0341 Remove Salt Search system, this never worked 2017-05-15 09:46:30 -06:00
Sébastien Wains
a4974ccaa3 Fix mine.get compound example 
os was missing the grain prefix
 2017-05-15 13:56:55 +02:00
Adam Mendlik
c68df1580c Fix typos in comment blocks 2017-05-14 17:27:19 -06:00
Nicole Thomas
97baddaa10 Merge pull request #41224 from rallytime/probot-stale-config 
Add probot-stale config file for the salt repo
 2017-05-12 18:17:23 -06:00
Nicole Thomas
726c2a5346 Merge pull request #41222 from rallytime/merge-develop 
[develop] Merge forward from nitrogen to develop
 2017-05-12 18:14:10 -06:00
Seth House
f1dc63f16c Add performance expectations and recommendations to rest_cherrypy docs 2017-05-12 17:57:32 -06:00
Nicole Thomas
2b533540fd Merge pull request #41221 from rallytime/bp-41211 
Back-port #41211 to nitrogen
 2017-05-12 17:48:23 -06:00
rallytime
3e75628f87 Add probot-stale config file for the salt repo 
This config file enables the [probot-stale](https://github.com/probot/stale/)
bot to comment on stale issues. We're starting off with issues
that have become stale after approximately 3 years and 6 months.
This value is configured in the `daysUntilStale` setting.
 2017-05-12 17:31:39 -06:00
rallytime
c8bfb1713f Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - salt/modules/elasticsearch.py
  - salt/states/chocolatey.py
  - salt/utils/gitfs.py
 2017-05-12 17:05:20 -06:00
rallytime
d75a7e0d0f Merge branch 'nitrogen' into 'develop' 
No conflicts.
 2017-05-12 16:42:54 -06:00
rajvidhimar
1916872c53 Fix junos grains 2017-05-12 16:41:04 -06:00
Nicole Thomas
cc476bf66e Merge pull request #41217 from terminalmage/fix-versionadded 
Fix versionadded
 2017-05-12 16:30:49 -06:00
Erik Johnson
b5bca6ea6d Fix versionadded 
The develop branch is Oxygen currently, not Nitrogen.
 2017-05-12 14:26:40 -05:00
Seth House
e61b83c09e Move the local TOC up since it's such a large docstring 2017-05-12 12:03:26 -06:00
Mike Place
049712ba53 Merge pull request #41146 from terminalmage/backport-get_tree-performance-improvement 
gitfs: Backport performance fixes for getting tree objects
 2017-05-12 12:35:46 -05:00
twangboy
e9df95d2a0 Add timout in tests instead of publish 2017-05-12 11:32:04 -06:00
Mike Place
c195d075cd Merge pull request #41151 from twangboy/fix_py_install 
Fix python 2.7.13 install, fix clean script
 2017-05-12 12:31:29 -05:00
Mike Place
aed2e18010 Merge pull request #41160 from UtahDave/stalekey_path 
Create presence.p directly in cachedir
 2017-05-12 12:28:32 -05:00
Mike Place
4215a0b99d Merge pull request #41161 from The-Loeki/2016.11 
gpg renderer: fix gpg_keydir always reverting to default
 2017-05-12 12:19:06 -05:00
Mike Place
5b10fc58ba Merge pull request #41163 from onlyanegg/elasticsearch-pass_profile_to_index_exists 
Elasticsearch - pass hosts and profile to index_exists()
 2017-05-12 12:18:05 -05:00
Mike Place
8028b9f00f Merge pull request #41182 from amendlik/win-authtest 
Saltify credendial verification for Windows
 2017-05-12 12:05:07 -05:00
Mike Place
d433cf850d Merge pull request #41186 from jmarinaro/fix-chocolatey-package-collision 
Fix package name collisions in chocolatey state
 2017-05-12 12:01:30 -05:00
Mike Place
90575c0832 Merge pull request #41187 from pcn/allow-slack-to-pass-args 
Allows the salt.utils.slack query() to pass args
 2017-05-12 11:33:03 -05:00
Mike Place
bb5ef41ce0 Merge pull request #41189 from github-abcde/utils-minions-fix 
utils/minions.py: Fixed case where data is an empty dict resulting in…
 2017-05-12 11:32:24 -05:00