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

36371 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shichao An
0fc2bf5284 Fixed saltutil.cmd_iter doc for automodule 2014-09-03 10:00:12 -07:00
Thomas S Hatch
026ac7b201 Don't use underscores in options to the cli! 2014-09-03 10:05:36 -06:00
Thomas S Hatch
484fa944c9 This fixes a bad data output when prereq prerequireds break 
Fix #15463 Fix #15331
 2014-09-03 09:55:10 -06:00
Thomas S Hatch
d5602028ce Merge pull request #15466 from cimarronm/correct_test_result_states.file.prepend 
Bugfix for result returned from states.file.prepend with test option
 2014-09-03 09:01:42 -06:00
Thomas S Hatch
7bd6bfb681 Merge pull request #15464 from dmuntean/fix-mount-options-on-linux 
Fix mount module and state on linux to stop remounting every time state is executed.
 2014-09-03 08:51:08 -06:00
Thomas S Hatch
04f8d216f7 Merge pull request #15473 from thatch45/talwai-patch-2 
Merge #15458 with lint fix
 2014-09-03 08:48:31 -06:00
Thomas S Hatch
baef98da29 Lint fix 2014-09-03 08:46:58 -06:00
Thomas S Hatch
c1aa82173a Merge branch 'patch-2' of https://github.com/talwai/salt into talwai-patch-2 2014-09-03 08:46:35 -06:00
Thomas S Hatch
ab1c6bcf27 One more test fix 2014-09-03 08:43:52 -06:00
Thomas S Hatch
5c3c460559 Merge pull request #15360 from cimarronm/module_pip_refactor 
Refactored common code in salt.module.pip to make it easier to main...
 2014-09-03 08:42:09 -06:00
Joseph Hall
78b7ace6e1 Merge pull request #15469 from terminalmage/add-pygit2-install-link 
Add pygit2 install link to gitfs walkthrough
 2014-09-03 06:40:47 -06:00
Antoine Jacoutot
3c2d2feaf8 Extend service.enabled() to accept kwargs 
This can be used to create stronger checks on the 'enabled' status of a
service. For example, if the service is enabled with the proper flags.
 2014-09-03 14:03:39 +02:00
Thomas S Hatch
00418effee Add ssh_minion_cache option to the cli parser 2014-09-02 23:07:10 -06:00
Thomas S Hatch
56014f91b0 Make the default thin dir use the login user 2014-09-02 22:54:29 -06:00
Thomas S Hatch
1df582569f Merge pull request #15449 from basepi/hideconcurrent 
Hide `concurrent` arg for state.sls
 2014-09-02 22:35:30 -06:00
Erik Johnson
3c800cdd5f Add pygit2 install link to gitfs walkthrough 2014-09-02 23:33:11 -05:00
Thomas S Hatch
666602ecf3 Merge pull request #15461 from cimarronm/grains_core_osfullname_key 
Bug in grains.core
 2014-09-02 22:31:39 -06:00
Thomas S Hatch
6fcdd1ed11 Merge pull request #15468 from thatch45/ssh_clean_pillar 
Ssh clean pillar
 2014-09-02 22:31:11 -06:00
Thomas S Hatch
8180ad9fc4 Merge pull request #15467 from thatch45/ssh_meta_2 
Salt ssh meta data
 2014-09-02 22:29:55 -06:00
Thomas S Hatch
4736382b1e Merge pull request #15465 from thatch45/call_meta 
Call meta
 2014-09-02 22:29:27 -06:00
Thomas S Hatch
0944019c61 Add ssh_minion_cache option 2014-09-02 22:26:31 -06:00
Thomas S Hatch
397bb12674 set the wfuncs to handle the new metadata sent back 2014-09-02 21:46:59 -06:00
Cimarron Mittelsteadt
e71e5b8608 BUG: Fix for result in states.file.prepend to return the correct result when test option is set (see issue #15397) 2014-09-02 20:05:56 -07:00
Thomas S Hatch
b543568896 refine metadata routine to get the correct data 2014-09-02 21:01:49 -06:00
Thomas S Hatch
d805d7d1d7 handle the metadata passed back from the caller routine 
in salt ssh
 2014-09-02 20:55:00 -06:00
Thomas S Hatch
0b613da1db Add metadata to ssh call 2014-09-02 20:54:57 -06:00
Thomas S Hatch
10536753b5 Use the metadata option to display the full ret 2014-09-02 20:41:08 -06:00
Thomas S Hatch
923b8ad7aa Add metadata optio to the parser 2014-09-02 20:40:56 -06:00
Dmitri Muntean
1546ca96aa 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 12:25:37 +10:00
Cimarron Mittelsteadt
c295d3b33f BUG: Set warning on deprecated runas option to occur at the right stack level 2014-09-02 17:22:00 -07:00
Cimarron Mittelsteadt
1edbf8250e BUG: Use grains.get for osfullname since the key may not exist on some platforms 2014-09-02 16:58:26 -07:00
Thomas S Hatch
b95d575e52 Fix tests for new changes from PR #15217 2014-09-02 17:39:50 -06:00
Thomas S Hatch
4b32ec8e06 Merge branch '15170-keep-comments' of https://github.com/dmyerscough/salt into dmyerscough-15170-keep-comments 2014-09-02 17:38:19 -06:00
Thomas S Hatch
1d85209c7f Merge pull request #15456 from cachedout/eauth_clarify 
Clarify a point about runners and eauth
 2014-09-02 17:33:48 -06:00
Thomas S Hatch
235dbca5ce Merge pull request #15453 from terminalmage/remove-masterless-examples 
Remove references to masterless salt from gitfs docs
 2014-09-02 17:33:32 -06:00
Thomas S Hatch
3606bd4ef4 Merge pull request #15450 from cachedout/file_managed_list 
Document multiple file.managed sources
 2014-09-02 17:33:06 -06:00
Thomas S Hatch
32c99ce1d6 Merge pull request #15440 from hulu/useradd 
modules.useradd.get_loginclass: avoid shadowing outer info() func
 2014-09-02 17:32:42 -06:00
Thomas S Hatch
7eed565893 Merge pull request #15459 from thatch45/Supermathie-virtualdetection 
Supermathie virtualdetection
 2014-09-02 17:31:52 -06:00
Thomas S Hatch
ba2bc8ddf0 lint fixes 2014-09-02 17:31:16 -06:00
Thomas S Hatch
f4af0fed2b Merge branch 'virtualdetection' of https://github.com/Supermathie/salt into Supermathie-virtualdetection 2014-09-02 17:28:54 -06:00
Colton Myers
4214f8dc2b Merge branch '2014.7' into develop 
Conflicts:
	salt/utils/network.py
 2014-09-02 16:35:03 -06:00
Colton Myers
0fa830b5b5 Merge pull request #15445 from cachedout/issue_15418 
Align highstate output
 2014-09-02 16:24:49 -06:00
Aaditya Talwai
001d418fa0 Add NoneType check for opts in modules.git.init 
`opts` should default to '' in `git.init`, as is the case with all other functions in `modules.git`
 2014-09-02 15:24:15 -07:00
Mike Place
350b6f853a Typo 2014-09-02 16:19:59 -06:00
David Boucha
8d69c33b9d Merge pull request #15454 from rallytime/fix_cloud_regression 
Fix cloud regression on develop
 2014-09-02 16:12:46 -06:00
Thomas S Hatch
df7b54b748 Merge pull request #15388 from Setsuna666/feature-ext_pillar-file_tree-nodegroups 
Feature - Add support for node groups in the file tree external pillar module
 2014-09-02 16:08:02 -06:00
Thomas S Hatch
5e2544a1a4 Merge pull request #15374 from cimarronm/module_brew_consistent_run_cmd 
modules.brew call with consistent user
 2014-09-02 16:02:36 -06:00
Thomas S Hatch
b456fce060 Merge pull request #15373 from garethgreenaway/returner_experiments 
Ability to override default returner configuration options.
 2014-09-02 15:57:29 -06:00
Thomas S Hatch
aa0828b629 Merge pull request #15455 from thatch45/davidone-zfs 
merge #15357 with fixes
 2014-09-02 15:56:29 -06:00
Mike Place
3075b1fd33 Clarify a point about runners and eauth 2014-09-02 15:56:25 -06:00