valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
36,573 Commits 24 Branches 182 Tags 341 MiB
f5b44764bc
Commit Graph

36573 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas S Hatch
f5b44764bc Merge branch 'at_quote' of https://github.com/cachedout/salt into cachedout-at_quote 2014-11-17 17:15:42 -07:00
Mike Place
7cc16c965a Quotes for at mod 2014-11-17 12:09:57 -07:00
Thomas S Hatch
2ed441780e Merge pull request #18096 from gtmanfred/2014.7 
add ability to configure config_drive
 2014-11-14 14:37:20 -07:00
Thomas S Hatch
792358c5e0 Merge pull request #18101 from eliasp/2014.7-doc.topics.mine-mine_functions_example 
Fix YAML syntax in mine_functions example.
 2014-11-14 14:36:48 -07:00
Thomas S Hatch
408df5a671 Merge pull request #18092 from CashStar/2014.7 
fixing insert statement
 2014-11-14 14:34:47 -07:00
Thomas S Hatch
8ba7f49658 Merge pull request #18075 from whiteinge/doc-file.replace-escaping 
Added note to file.replace about avoiding quoting and escaping in YAML
 2014-11-14 14:24:22 -07:00
Thomas S Hatch
a9cfb31baa Merge pull request #18062 from jacksontj/2014.7 
An additional fix for #17080
 2014-11-14 14:23:09 -07:00
Thomas S Hatch
4e850f9e2b Merge pull request #18043 from jfindlay/update_unit_test_docs 
Update unit test docs
 2014-11-14 14:18:18 -07:00
Thomas S Hatch
616d7d0cfc Merge pull request #17952 from Unity-Technologies/osx-fix-run-as-user 
Cherry picked: Fix salt.utils.chugid group_list filtering on OS X
 2014-11-14 14:07:29 -07:00
Elias Probst
5580c714a5 Fix YAML syntax in mine_functions example. 
The elements provided for a mine_functions definition need to be
either a list or a dict, but not a mix of both.
 2014-11-14 21:25:30 +01:00
Thomas S Hatch
3286bc0833 Merge pull request #17941 from whiteinge/salt-file.managed-changes 
Return a changes dictionary for file.managed in test=true mode
 2014-11-14 13:07:26 -07:00
Daniel Wallace
65a23c8546 add ability to configure config_drive 
this is required to use userdata_file for rackspace
 2014-11-14 10:52:47 -06:00
Thomas S Hatch
447d69661d Merge pull request #17712 from juiceinc/bugfix/adding-ppas 
Updated aptpkg.mod_repo() module to properly add new PPAs
 2014-11-14 09:47:05 -07:00
nevins-b
9cf30dfa31 fixing insert statement 2014-11-14 09:19:25 -05:00
Seth House
33255a8b01 Added note to file.replace about avoiding quoting and escaping in YAML 2014-11-13 19:12:42 -05:00
Thomas Jackson
1454e8a514 An additional fix for #17080 2014-11-13 11:34:18 -08:00
Colton Myers
21bf2ef724 Merge pull request #18061 from terminalmage/sync_all-docstring 
Add explanation of "refresh" arg to saltutil.sync_all
 2014-11-13 12:29:22 -07:00
Erik Johnson
6a7570c8d6 Add explanation of "refresh" arg to saltutil.sync_all 2014-11-13 13:18:47 -06:00
Pedro Algarvio
600c4d5cd8 Merge pull request #17968 from basepi/issue_17687 
Only read first line of minion_id
 2014-11-13 01:55:41 +00:00
Justin Findlay
9158661205 expand unittest docs: formal style, more examples 2014-11-12 16:55:50 -07:00
Justin Findlay
217217f624 wrap unittest doc at 80 chars 2014-11-12 15:59:35 -07:00
Mike Place
da893d2715 Merge pull request #17953 from rallytime/spelling_fix 
Fix spelling in raet doc
 2014-11-12 13:14:09 -07:00
Colton Myers
c2237d1b2f Only read first line of minion_id, Fixes #17687 2014-11-12 12:46:54 -07:00
rallytime
07e8c393ed Fix spelling in raet doc 2014-11-12 06:50:38 -07:00
Jason R. McNeil
e3d9ce4537 Fix salt.utils.chugid group_list filtering on OS X 2014-11-12 14:36:13 +01:00
Seth House
71bb822846 Return a changes dictionary for file.managed in test=true mode 
Fixes #17939.
 2014-11-11 23:13:14 -05:00
Seth House
df8ca7d0d4 Add function like check_managed() but that returns the changes 2014-11-11 20:59:50 -05:00
Thomas S Hatch
c31bcb3fac Merge pull request #17682 from fessoga5/2014.7 
Fix error in lvcreate (pv=None)
 2014-11-11 14:43:39 -07:00
Thomas S Hatch
88b4e9459e Merge pull request #17305 from jacksontj/2014.7 
2014.7
 2014-11-11 14:09:13 -07:00
Tim O'Guin
88a015b6b8 Updated aptpkg.mod_repo() module to properly add new PPAs. To determine if the PPA needs to be added, parse the return of get_repo() rather than trying to catch its exceptions. 2014-11-11 14:40:03 -06:00
Thomas S Hatch
26d6bd8220 Merge pull request #17691 from makinacorpus/7 
factorize call
 2014-11-11 10:23:33 -07:00
Mathieu Le Marec - Pasquet
dafb765ad6 factorize call 2014-11-11 17:43:05 +01:00
Pedro Algarvio
f1d2fd8215 Re-enable setuptools console_scripts 2014-11-11 16:19:18 +00:00
fessoga5
86b7afa5a3 Fix error in lvcreate (pv=None) 2014-11-11 03:29:59 -05:00
C. R. Oldham
41f8539866 Merge pull request #17379 from cro/breaking_change4 
Add breaking change notice for module.run in 2014.1.0
 2014-11-10 16:29:30 -07:00
C. R. Oldham
25f7bf111a Add breaking change notice for module.run in 2014.1.0 2014-11-10 16:28:21 -07:00
Pedro Algarvio
318538785c Merge pull request #17311 from terminalmage/warn_until 
Restore old warnings.formatwarning after workaround
 2014-11-10 21:29:32 +00:00
Thomas Jackson
f24c94dd7b Pylint fixes 2014-11-10 13:03:35 -08:00
Erik Johnson
ee306e18b7 Restore old warnings.formatwarning after workaround 
See https://github.com/saltstack/salt/pull/17298#issuecomment-62364647
 2014-11-10 13:49:13 -06:00
Mike Place
1fd9983fc7 Merge pull request #17310 from rallytime/update_windows_pkg_doc 
Add 2014.7.0 release to windows installation doc
 2014-11-10 12:33:00 -07:00
Thomas S Hatch
57ddc2d0fd Merge pull request #17243 from basepi/minepublishpillar17194 
Enable pillar/compound matching in mine/publish, with no pillar globbing support
 2014-11-10 11:03:15 -07:00
Thomas S Hatch
6143cf3e17 Merge pull request #17304 from thatch45/hvnsweeting-fix-rabbitmq-user-state 
Merge #17225
 2014-11-10 11:00:20 -07:00
Colton Myers
23f7310898 Merge pull request #17306 from basepi/releasenotesoops 
Fix the release notes note
 2014-11-10 09:52:00 -07:00
Colton Myers
69fa6b2e3c Fix the release notes note 2014-11-10 09:51:21 -07:00
Thomas Jackson
c43ac0a4c2 remove comment from local debugging 2014-11-10 08:33:39 -08:00
Thomas Jackson
e862642ff7 Add tests for SREQ class 
revert keys() change to socket dicts since we will mutate the dict on iteration
 2014-11-10 08:29:58 -08:00
Thomas Jackson
4cdd0acce6 Merge branch '2014.7' of github.com:saltstack/salt into 2014.7 2014-11-10 08:20:10 -08:00
Thomas S Hatch
755400e638 Merge pull request #17279 from skweezbox/chef 
Updates to chef execution module and new chef state module
 2014-11-10 09:18:16 -07:00
Thomas S Hatch
6d16071ef6 Merge pull request #17271 from hvnsweeting/hvn/remove-runas-rabbitmq 
remove runas in rabbitmq
 2014-11-10 09:17:29 -07:00
Thomas S Hatch
5b8ea79414 fix lint 2014-11-10 09:10:03 -07:00