valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
36,319 Commits 24 Branches 182 Tags 341 MiB
57e187d46f
Commit Graph

36319 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Colton Myers
57e187d46f Merge branch '2014.7' into develop 
Conflicts:
	salt/modules/mount.py
 2014-09-04 13:45:03 -06:00
Colton Myers
639f692130 Merge pull request #15518 from holmboe/patch-2 
Minor doc change
 2014-09-04 11:18:22 -06:00
Thomas S Hatch
5475d060e2 Merge pull request #15500 from basepi/bp-15466 
Backport #15466 to 2014.7
 2014-09-04 11:07:35 -06:00
Thomas S Hatch
f85fb339b7 Merge pull request #15498 from basepi/bp-15464 
Backport #15464 to 2014.7
 2014-09-04 11:07:13 -06:00
Thomas S Hatch
04c1822038 Merge pull request #15497 from basepi/bp-15410 
Backport #15410 to 2014.7
 2014-09-04 11:06:54 -06:00
Thomas S Hatch
05f5c024d2 Merge pull request #15496 from basepi/bp-15409 
Backport #15409 to 2014.7
 2014-09-04 11:06:38 -06:00
Thomas S Hatch
9f8683701e Merge pull request #15493 from basepi/bp-15272 
Backport #15272 to 2014.7
 2014-09-04 11:05:58 -06:00
Thomas S Hatch
a2e8d72f21 Merge pull request #15462 from garethgreenaway/returner_experiments 
Updates to returners, consolidated code.
 2014-09-04 11:03:23 -06:00
Henrik Holmboe
c43a99242c Minor doc change 2014-09-04 17:27:02 +02:00
Pedro Algarvio
35e81c3e06 Merge pull request #15506 from rallytime/document_libcloud_reqs 
Update cloud driver docs with/without libcloud deps
 2014-09-04 06:59:54 +01:00
rallytime
155b548eae Remove unnecessary import requirements to cloud integration tests 2014-09-03 20:12:44 -06:00
rallytime
86be50c876 Add libcloud dependency notice to provider docs 2014-09-03 20:10:51 -06:00
Pedro Algarvio
8b48542214 Merge pull request #15502 from UtahDave/develop 
Fix some misspellings and grammar
 2014-09-03 23:48:04 +01:00
David Boucha
a2cc5cbaaa fix grammar 2014-09-03 16:40:05 -06:00
David Boucha
bc7b3289e8 fix some misspellings and grammar 2014-09-03 16:40:05 -06:00
Colton Myers
f8c6fc00b6 Merge branch '2014.7' into develop 2014-09-03 16:24:12 -06:00
Colton Myers
3a5f8281da Merge pull request #15490 from basepi/backport_boto 
Backport boto modules/states/tests
 2014-09-03 16:23:35 -06:00
Cimarron Mittelsteadt
e00dffb61a BUG: Fix for result in states.file.prepend to return the correct result when test option is set (see issue #15397) 2014-09-03 16:12:11 -06:00
Dmitri Muntean
2f173f07bd Fix salt.modules.mount.active to use /proc/self/mounts, unless user explicitly enabled use of /proc/self/mountinfo via extended=True option. Fix remount on every state application, when options that don't appear in /proc/self/mounts are used. 2014-09-03 16:10:40 -06:00
Nitin Madhok
ef05362c6c Fixing more sphinx errors and violations 2014-09-03 16:05:36 -06:00
Nitin Madhok
6ce392b236 More sphinx errors and violations 2014-09-03 16:05:07 -06:00
Nitin Madhok
97911e604a Fixing sphinx errors and violations 2014-09-03 16:03:25 -06:00
Dan Mick
1c4c63428b salt/utils/process.py: fix order of args to os.kill() 
Fixes: #15269
Signed-off-by: Dan Mick <dan.mick@inktank.com>
 2014-09-03 16:00:57 -06:00
Thomas S Hatch
eed43c9a29 Merge pull request #15491 from thatch45/job_doc 
Add doc on job cache
 2014-09-03 15:37:30 -06:00
Thomas S Hatch
53855f7886 Add doc on job cache 2014-09-03 15:36:48 -06:00
Thomas S Hatch
df6a3c1963 Merge pull request #15479 from cachedout/no_cloud 
Migrate salt.cloud.exceptions to salt.exceptions
 2014-09-03 15:25:05 -06:00
Colton Myers
c7b666fe43 Bring boto state tests from develop to 2014.7 2014-09-03 15:22:55 -06:00
Colton Myers
c127b4bafe Bring boto module tests from develop to 2014.7 2014-09-03 15:22:17 -06:00
Colton Myers
e8fc048367 Bring boto states from develop to 2014.7 2014-09-03 15:21:21 -06:00
Colton Myers
b565c6e7ec Bring boto modules from develop to 2014.7 2014-09-03 15:20:23 -06:00
Gareth J. Greenaway
d5fcb31395 Moving the get_options function into the __init__.py instead of utils.py. 2014-09-03 13:56:48 -07:00
Gareth J. Greenaway
c87d91ee82 Consolidating the _get_options function from all the returners that were using it into the config module. Additionally some cleanup and ability to pass defaults to the get_returner_options function. 
fixing lint issues

moving the get_options function into a utils.py under returners.  previous attempt at using a call to the salt config module doesn't work if the returner is called from the scheduler.

adding missing docstring

Unit tests were failing for SMTP returner because __opts__ was not available.  Ensuring it's available, empty, if it doesn't already exist.

removing the check and population with an empty dict for __salt__ and __opts__.  Adding an empty __opts__ to the smtp returner unit tests.
 2014-09-03 13:56:48 -07:00
Thomas S Hatch
2f6ae96f37 Merge branch '2014.7' into develop 
Conflicts:
	salt/client/ssh/__init__.py
 2014-09-03 14:43:07 -06:00
Thomas S Hatch
06ad20e1f2 Merge pull request #15483 from nmadhok/develop 
Improving salt.modules.file
 2014-09-03 14:38:47 -06:00
Mike Place
a46c4a85c3 Missed one lint 2014-09-03 14:36:52 -06:00
Mike Place
c8f67c2b89 Fix tests and lint 2014-09-03 14:17:27 -06:00
Mike Place
8974550868 Remove what seem to be unused imports. 2014-09-03 14:12:03 -06:00
Thomas S Hatch
9acf13bf39 Merge pull request #15480 from terminalmage/add-unit-file 
Add salt-api unit file symlink
 2014-09-03 14:02:01 -06:00
Nitin Madhok
b11a7cd5e5 Removing trailing whitespace 2014-09-03 15:54:08 -04:00
Nitin Madhok
0e61c4125d Fixing sphinx violation and warning 2014-09-03 15:22:26 -04:00
Nitin Madhok
e89b02fb04 Improving salt.modules.file 2014-09-03 15:20:46 -04:00
Erik Johnson
cbdee403bd Add salt-api unit file symlink 2014-09-03 13:42:21 -05:00
Mike Place
e5153ffd3d Migrate salt.cloud.exceptions to salt.exceptions 
This means that we no longer have to load salt.cloud when calling the
salt cli and paves the way for additional sandboxing of salt-cloud to avoid
unecessary imports.
 2014-09-03 12:30:28 -06:00
Thomas S Hatch
166bafa74d Merge pull request #15477 from shichao-an/fix-doc-typo 
Fixed saltutil.cmd_iter doc for automodule
 2014-09-03 12:09:58 -06:00
Thomas S Hatch
887a898728 Merge pull request #15475 from thatch45/ssh_user_iso 
Ssh user iso
 2014-09-03 12:09:18 -06:00
Thomas S Hatch
96d4dc3844 Merge pull request #15474 from thatch45/prereq_bad_data 
This fixes a bad data output when prereq prerequireds break
 2014-09-03 12:08:23 -06:00
Thomas S Hatch
931effa5a4 Merge pull request #2 from jacksontj/thatch45/prereq_bad_data 
Add __run_num__ and __sls__ to prereq failure condition
 2014-09-03 12:07:54 -06:00
Thomas S Hatch
787f163580 Merge pull request #15460 from thatch45/dmyerscough-15170-keep-comments 
Merge #15217 with fixes
 2014-09-03 12:07:14 -06:00
Thomas Jackson
f72a753bad Add __run_num__ and __sls__ to prereq failure condition 
In addition add some comments to hopefully explain what we are doing
 2014-09-03 11:03:45 -07:00
Shichao An
0fc2bf5284 Fixed saltutil.cmd_iter doc for automodule 2014-09-03 10:00:12 -07:00