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
41,626 Commits 24 Branches 182 Tags 341 MiB
9d7517c791
Commit Graph

41626 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas S Hatch
9d7517c791 Merge pull request #18166 from thatch45/nmadhok-daemons/flo-python3-core 
Merge #18010
 2014-11-17 16:38:12 -07:00
Thomas S Hatch
4c3204cff5 modernize took out the next and the name 2014-11-17 16:37:07 -07:00
Thomas S Hatch
3f0ebfc3eb Merge branch 'daemons/flo-python3-core' of https://github.com/nmadhok/salt into nmadhok-daemons/flo-python3-core 2014-11-17 16:35:39 -07:00
Thomas S Hatch
b39106752b Merge pull request #17805 from nmadhok/pillar-python3-mysql 
Making salt.pillar.mysql python3 compatible
 2014-11-17 16:27:59 -07:00
Thomas S Hatch
d8bf960a99 Merge pull request #17284 from smoothify/develop 
Read Pillar files into OrderedDict to preserve source order
 2014-11-17 16:26:23 -07:00
Thomas S Hatch
6fae7603ba Merge pull request #16963 from dmyerscough/sudo-recommendation 
client_acl with sudo
 2014-11-17 16:25:41 -07:00
Damian Myerscough
3ed419288a sudo_client acl directive 2014-11-17 14:13:06 -08:00
Damian Myerscough
d8037a7a05 Allow users to set sudo_acl via config in order to force sudo in acl group 2014-11-17 14:00:14 -08:00
Damian Myerscough
40e3f66151 Merge branch 'develop' of https://github.com/saltstack/salt into sudo-recommendation 2014-11-17 13:56:05 -08:00
Colton Myers
6b85155a6d Merge pull request #18157 from basepi/client_acl_docs 
Add one additional folder and clarification to client_acl docs
 2014-11-17 14:55:46 -07:00
Colton Myers
b2a2facb27 Add one additional folder and clarification to client_acl docs 2014-11-17 14:55:08 -07:00
Damian Myerscough
ed422d6300 Merge branch 'develop' into sudo-recommendation 2014-11-17 13:52:50 -08:00
Thomas S Hatch
6eb90b7e0c Merge pull request #18142 from s0undt3ch/hotfix/build-docs 
Revert "Add six to list of mocked modules"
 2014-11-17 10:25:59 -07:00
Pedro Algarvio
8fda8badbb Revert "Add six to list of mocked modules" 
This reverts commit 6ebf0fd3aa.

We need six installed in order for the docs to build. Six is too magical
to be mocked, at last, for now.
 2014-11-17 16:45:46 +00:00
Pedro Algarvio
78ac93363c Merge pull request #18130 from terminalmage/quickfix 
Remove heading from top-level docstrings
 2014-11-17 12:17:05 +00:00
benosman
d553d4e85f Read Pillar files into OrderedDict to preserve source order 2014-11-17 11:17:57 +00:00
Erik Johnson
4c043ab245 Remove heading from top-level docstrings 
It makes sphinx's autosummary look off by showing up in the summary
text. For example:

http://docs.saltstack.com/en/latest/ref/modules/all/index.html
 2014-11-16 19:44:56 -06:00
Pedro Algarvio
b6e6968c22 Merge pull request #18125 from cvrebert/patch-1 
btrfs module: use new-style except-as syntax
 2014-11-16 08:39:04 +00:00
Chris Rebert
2caed25f7f btrfs module: use new-style except-as syntax 2014-11-16 00:25:51 -08:00
Erik Johnson
c0f6d45e3d Merge pull request #18112 from rallytime/cli_example 
Add CLI example to btrfs.version
 2014-11-15 22:43:36 -06:00
Joseph Hall
6f67a2a11e Merge pull request #18122 from slafs/formula-docfix 
small doc fix
 2014-11-15 18:35:36 -07:00
Sławek Ehlert
9e19772bff base arg should be a key (string) of the given dict 2014-11-16 00:05:25 +01:00
Thomas S Hatch
1e7bc9cba1 Merge pull request #18105 from thatch45/oldmantaiter-sysctl-fixes 
Merge #18079
 2014-11-14 16:32:23 -07:00
rallytime
003e14a939 Add CLI example to btrfs.version 2014-11-14 16:05:36 -07:00
Mike Place
d88b4a915a Merge pull request #18110 from rallytime/fix_linx_acl_test 
Fix up the linux_acl test that is failing
 2014-11-14 16:04:25 -07:00
Thomas S Hatch
4af9d1234e Merge pull request #18111 from slafs/grains-filterby-docfix 
fix docs for filter_by arguments
 2014-11-14 15:51:51 -07:00
Thomas S Hatch
fcdbdd4018 more lint 2014-11-14 15:45:14 -07:00
rallytime
652d4b4803 Fix up the linux_acl test that is failing 2014-11-14 15:40:12 -07:00
Thomas S Hatch
0f2be9c476 Merge pull request #18108 from thatch45/lint_py3 
some lint disables for lint shortcomings wrt python six
 2014-11-14 15:33:27 -07:00
Thomas S Hatch
2b1317c0af some lint disables for lint shortcomings wrt python six 2014-11-14 15:18:35 -07:00
Sławek Ehlert
18db31fe8c fix docs for filter_by arguments 
It seems that ``base`` arg is only on Lithium (develop branch)
and the ``default`` arg was actually added on 2014.1.0.
This is particularly confusing because its usage is shown on formulas docs
as a best practice

http://docs.saltstack.com/en/latest/topics/development/conventions/formulas.html#collecting-common-values
 2014-11-14 23:14:06 +01:00
Thomas S Hatch
c7c07c5bde Merge pull request #18106 from saltstack/revert-18036-salt-python3-_compat 
Revert "Making salt/_compat python3 compatible"
 2014-11-14 15:05:17 -07:00
Thomas S Hatch
5e9c13c18a Revert "Making salt/_compat python3 compatible" 2014-11-14 15:04:32 -07:00
Thomas S Hatch
ac4351cd84 Merge pull request #17964 from dmyerscough/fix-17198 
Support multiple entries #17198
 2014-11-14 14:56:45 -07:00
Thomas S Hatch
df06a1bd3c Merge branch 'sysctl-fixes' of https://github.com/oldmantaiter/salt into oldmantaiter-sysctl-fixes 
Conflicts:
	salt/modules/netbsd_sysctl.py
 2014-11-14 14:45:27 -07:00
Thomas S Hatch
13e007ba5b Merge pull request #18103 from rallytime/add_six_import 
Don't remove six import, only disable for pylint
 2014-11-14 14:42:12 -07:00
Thomas S Hatch
9bdc9e1c55 Merge pull request #18104 from thatch45/cachedout-issue_17160 
Merge #18070 with fixes
 2014-11-14 14:41:50 -07:00
Thomas S Hatch
0f3f3e6ba1 lint 2014-11-14 14:40:57 -07:00
Thomas S Hatch
21edd4ebfa Merge branch 'issue_17160' of https://github.com/cachedout/salt into cachedout-issue_17160 2014-11-14 14:40:09 -07:00
Thomas S Hatch
6d38d2db62 Merge branch '2014.7' into develop 
Conflicts:
	salt/utils/__init__.py
 2014-11-14 14:38:55 -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
42c38fb0ec Merge pull request #18102 from thatch45/isbm-btrfs-module 
Merge #17282 with fixes
 2014-11-14 14:37:03 -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
670e76d90b Merge pull request #18084 from nmadhok/patch-1 
Checking if exceptions module can be imported as it's removed from Python3
 2014-11-14 14:32:48 -07:00
Thomas S Hatch
8a2ff822bc Merge pull request #18082 from clan/extfs 
extfs: skip 'Group descriptor size'
 2014-11-14 14:31:45 -07:00
Thomas S Hatch
cfd9352e8b Merge pull request #18076 from UtahDave/develop 
add additional repository command
 2014-11-14 14:24:56 -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
81a5d78632 Merge pull request #18069 from tehmaspc/tehmaspc_typo_fix_cloud_config 
Typo fix and formatting
 2014-11-14 14:23:29 -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