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
61,925 Commits 24 Branches 182 Tags 341 MiB
5b23b91ac6
Commit Graph

61925 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Justin Anderson
5b23b91ac6 Integration test for gem module 2016-06-01 15:09:55 -06:00
Mike Place
504989388a Merge pull request #33615 from danslimmon/mysql-traceback-33582 
Fix crash on unconnectable MySQL server (resolves #33582)
 2016-05-31 09:03:51 -07:00
Dan Slimmon
180099ae9f Wrote test for broken server connection 2016-05-30 03:23:18 +00:00
Dan Slimmon
c6c3ff02e3 Added some error checking to resolve #33582. 2016-05-30 03:22:59 +00:00
Mike Place
b47182e47c Merge pull request #33558 from twangboy/fix_win_servermanager 
Fix win servermanager
 2016-05-27 15:05:43 -07:00
twangboy
62a6bde0ea Fix comment when already installed 2016-05-27 11:33:52 -06:00
twangboy
79bc7195dc Fix unit tests 2016-05-27 11:33:52 -06:00
twangboy
56a6f6bb83 Fix changes 2016-05-27 11:33:52 -06:00
twangboy
8ebe99ec5e Fix restart_needed 2016-05-27 11:33:52 -06:00
twangboy
6e478cbda0 Add restart needed 2016-05-27 11:33:52 -06:00
twangboy
72ebf26616 Add missing import 2016-05-27 11:33:52 -06:00
twangboy
193583be96 Use dictionary compare for changes in remove 2016-05-27 11:33:52 -06:00
twangboy
1ae7dd76c1 Use dictionary compare for changes 2016-05-27 11:33:52 -06:00
Mike Place
58d89d66e3 Merge pull request #33555 from cachedout/issue_33544 
Fix crashing Maintenence process
 2016-05-26 12:25:39 -07:00
Mike Place
fe7ee7a470 Fix crashing Maintenence process 
The first time through the loop we deleted the dir and then stack
traced the second time through the loop if we hit the other conditional.

Resolves #33544
 2016-05-26 11:14:56 -06:00
Mike Place
d052908729 Merge pull request #33501 from meaksh/zypper-download-check-signature-2015.8 
unit tests for rpm.checksum() and zypper.download()
 2016-05-26 07:34:27 -07:00
Mike Place
e2d0c4abb1 Merge pull request #33513 from rallytime/fix-33319 
Add a section to the jinja docs about escaping jinja
 2016-05-26 07:24:58 -07:00
Mike Place
fabc15e616 Merge pull request #33520 from jacobhammons/release-notes.8 
Updated version numbers in the docs for the 2016.3.0 release
 2016-05-26 07:15:00 -07:00
Pablo Suárez Hernández
eaaef25c79 lint issue fixed 2016-05-26 08:26:24 +01:00
Jacob Hammons
42e358af7d Updated version numbers in the docs for the 2016.3.0 release 2016-05-25 18:06:03 -06:00
rallytime
81c1471209 Add a section to the jinja docs about escaping jinja 
Fixes #33319
 2016-05-25 15:26:11 -06:00
Nicole Thomas
5a6b037cbd Merge pull request #33507 from rallytime/merge-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2016-05-25 13:14:41 -06:00
rallytime
03b0c97520 Merge branch '2015.5' into '2015.8' 
Conflicts:
  - doc/ref/configuration/master.rst
  - doc/ref/configuration/minion.rst
 2016-05-25 12:26:00 -06:00
Mike Place
ee76be3b0b Merge pull request #33503 from rallytime/fix-15252 
Add docs about minion config file in standalone minion docs
 2016-05-25 10:23:07 -07:00
Mike Place
6f7fda0354 Merge pull request #33486 from jtand/2015.5 
Add docstring examples to glance.py [2015.5]
 2016-05-25 10:21:22 -07:00
Mike Place
e9b648e461 Merge pull request #33474 from cachedout/issue_29451 
Fix diskusage beacon
 2016-05-25 10:10:53 -07:00
rallytime
cfc07f7641 Add docs about minion config file in standalone minion docs 
Fixes #15252
 2016-05-25 11:00:12 -06:00
Mike Place
3bfb6bf719 Merge pull request #33465 from meaksh/check-if-job-returns-successfully-2015.8 
jobs.exit_success allow to check if a job has executed and exit successfully
 2016-05-25 09:52:52 -07:00
Mike Place
70eb7b66f3 Merge pull request #33487 from jtand/glance_doc_fixes 
Add docstring examples to glance.py and nova.py [2015.8]
 2016-05-25 09:47:25 -07:00
Mike Place
56ea979916 Merge pull request #33481 from rallytime/fix-33423 
Fix docs about etcd config options and add pillar_opts doc
 2016-05-25 09:41:55 -07:00
Mike Place
2394cdc4bf Merge pull request #33490 from rallytime/fix-16319 
Document the postgres.psql_query function
 2016-05-25 09:41:22 -07:00
Mike Place
f72ec1479b Merge pull request #33482 from rallytime/pillar-opts-docs 
Add pillar_opts docs to master.rst
 2016-05-25 09:39:25 -07:00
Mike Place
ede232f0f1 Merge pull request #33480 from jfindlay/service_doc 
states.service: minor doc updates
 2016-05-25 09:38:14 -07:00
Justin Anderson
d1e210fff8 Merge branch '2015.5' of https://github.com/saltstack/salt into 2015.5 2016-05-25 10:28:18 -06:00
Shane Lee
4f96cc1f54 Return full pending computer name (#33483) 2016-05-25 10:26:21 -06:00
Pablo Suárez Hernández
6b6febb211 unit tests for rpm.checksum() and zypper.download() 2016-05-25 17:08:16 +01:00
Mike Place
a89be5e9d4 Use six.string_types in jobs runner (#33499) 
Refs #33491
 2016-05-25 10:02:38 -06:00
Mike Place
dc644b145d Merge pull request #33488 from rallytime/fix-18752 
Add docs for the syndic_finger config
 2016-05-25 08:23:10 -07:00
Mike Place
2e24a04565 Merge pull request #33491 from BlaineAtAffirm/2015.8 
fix jobs.list_jobs failing with search_target
 2016-05-25 08:11:22 -07:00
Pablo Suárez Hernández
9deb70fd8e jobs.exit_success() now works parsing the results of jobs.lookup_id() 2016-05-25 09:10:04 +01:00
Blaine Chatman
7599b18995 fix jobs.list_jobs failing with search_target 2016-05-24 17:56:45 -07:00
rallytime
0c5548f9d1 Document the postgres.psql_query function 
Fixes #16319
 2016-05-24 16:54:06 -06:00
rallytime
b0a9f4181f Add docs for the syndic_finger config 
Fixes #18752
 2016-05-24 16:10:43 -06:00
Justin Anderson
0b1cae05d9 Added docstring examples to glance methods and nova.list 2016-05-24 15:35:44 -06:00
Justin Anderson
ebf1256545 Don't need to check swift.head due to it having no body 2016-05-24 15:26:28 -06:00
Justin Anderson
ee2ae0ea8a Added docstring examples to glance.image_schema and schema_get 2016-05-24 15:16:07 -06:00
Justin Anderson
59e90064e6 modules.swift.head does not have a body. Should not be checked for a docstring right now. 2016-05-24 14:58:32 -06:00
rallytime
087564528d Add pillar_opts docs to master.rst 2016-05-24 13:26:24 -06:00
rallytime
7fd3e8f361 Fix docs about etcd config options and add pillar_opts doc 
Fixes #33423
 2016-05-24 13:19:20 -06:00
Mike Place
1861af427e Merge pull request #33478 from rallytime/bp-32484 
Back-port #32484 to 2015.8
 2016-05-24 12:14:23 -07:00