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
39,288 Commits 24 Branches 182 Tags 341 MiB
c8bfd87105
Commit Graph

39288 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas S Hatch
c8bfd87105 Merge pull request #17153 from rallytime/merge_forward 
Merge 2014.7 into develop
 2014-11-04 15:03:28 -07:00
C. R. Oldham
77b3817d7a Merge pull request #17155 from s0undt3ch/develop 
Copy `setup.py` from `2014.7`.
 2014-11-04 15:00:10 -07:00
rallytime
e010eb3e0e Resolve remaining merge conflicts 2014-11-04 14:11:39 -07:00
Thomas S Hatch
608d053844 Merge pull request #17121 from plastikos/improvement-yaml_quote 
Add yaml_dquote() and yaml_squote() utilites; load them as Jinja filters...
 2014-11-04 14:02:05 -07:00
Thomas S Hatch
bf71886366 Merge pull request #17092 from MrMarvin/feature/shell_glob_roots 
adds shell glob support to file_root and pillar_root
 2014-11-04 14:01:27 -07:00
Thayne Harbaugh
11c0999c66 Add a note to formulas documentation describing yaml_dquote filter. 2014-11-04 12:54:16 -07:00
Marvin Frick
836d0ca4f7 fixes pylint warnings (+1 squashed commit) 
Squashed commits:
[f3c8249] adds shell glob support to file_root and pillar_root
 2014-11-04 20:36:21 +01:00
Thayne Harbaugh
86923b0cbe Add documentation for Jinja filters: yaml_dquote, yaml_squote, sequence. 2014-11-04 12:25:18 -07:00
Pedro Algarvio
1372d65a7c Copy setup.py from 2014.7. 
Fixes #17138
 2014-11-04 17:43:02 +00:00
rallytime
b49c677af8 Merge branch '2014.7' into merge_forward 
Conflicts:
	salt/daemons/flo/core.py
	salt/daemons/salting.py
	salt/minion.py
	salt/modules/introspect.py
	salt/modules/lxc.py
	salt/modules/sysmod.py
	salt/runners/doc.py
	salt/states/cloud.py
	salt/transport/__init__.py
	salt/utils/github.py
 2014-11-04 10:07:02 -07:00
Thomas S Hatch
d499d7262a Merge pull request #17151 from steverweber/develop 
pass correct var
 2014-11-04 10:06:56 -07:00
Thomas S Hatch
7bfb0ef624 Merge pull request #17152 from thatch45/rominf-linux_acl_recursive 
Merge #17142 with fixes
 2014-11-04 10:06:15 -07:00
Thomas S Hatch
ff593e30b2 remove duplicate code 2014-11-04 10:05:24 -07:00
Steve Weber
508c3e6cbd pass correct var 
another opps
 2014-11-04 11:59:36 -05:00
Thomas S Hatch
3b8a9874f4 Merge branch 'linux_acl_recursive' of https://github.com/rominf/salt into rominf-linux_acl_recursive 2014-11-04 09:57:57 -07:00
Thomas S Hatch
7a8712db6c Merge pull request #17145 from bahadir/filefind-delete 
Added delete feature to file.find method
 2014-11-04 09:55:58 -07:00
Roman Inflianskas
202d3c343a modules.linux_acl: add recursive option for all functions 2014-11-04 19:54:41 +03:00
Thomas S Hatch
c7e224b174 Merge pull request #17133 from mgwilliams/schedule 
make schedule work with LazyLoader
 2014-11-04 09:53:18 -07:00
Thomas S Hatch
2b0ebdc84a Merge pull request #17150 from thatch45/rominf-linux_acl_test 
Merge #17139 with lint fixes
 2014-11-04 09:49:43 -07:00
Thomas S Hatch
8e8b4c6b5c lint 2014-11-04 09:48:58 -07:00
Thomas S Hatch
499ae6d8e4 Merge branch 'linux_acl_test' of https://github.com/rominf/salt into rominf-linux_acl_test 2014-11-04 09:48:27 -07:00
Thomas S Hatch
2200940231 Merge pull request #17137 from mbrukman/clouds-gce-cleanup-comment 
Removed "Supported commands" from header comment.
 2014-11-04 09:24:50 -07:00
Thomas S Hatch
f5cc100dd3 Merge pull request #17148 from thatch45/rallytime-add_xfs_cli_example 
Merge #17143
 2014-11-04 09:21:53 -07:00
Thomas S Hatch
8bad1d4909 lint 2014-11-04 09:21:09 -07:00
Thomas S Hatch
b34613c4f7 Merge branch 'add_xfs_cli_example' of https://github.com/rallytime/salt into rallytime-add_xfs_cli_example 2014-11-04 09:20:41 -07:00
Thomas S Hatch
fc8575d9f4 Merge pull request #17132 from mgwilliams/sdb_memcache 
add memcache sdb module and sdb execution modules
 2014-11-04 09:17:06 -07:00
Bahadır Kandemir
74d08b65f1 Add test mode to find. 
Add test mode to find to avoid deletions.
 2014-11-04 17:35:17 +02:00
Bahadır Kandemir
7479dc2331 Added delete feature to file.find method 
salt.modules.file.find doen't support documented feature "delete". This fixes #2827
 2014-11-04 17:12:51 +02:00
Matthew Williams
cbcc362033 use memcached instead of memcache for sdb and util modules 2014-11-04 14:00:15 +00:00
Matthew Williams
a522f694c2 detect available libs without throwing off lint 2014-11-04 13:44:57 +00:00
rallytime
9ea988a79a Add CLI example to xfs.prune_dump function 2014-11-04 06:37:14 -07:00
Joseph Hall
f771f2b63f Merge pull request #17135 from pengyao/scheduler_typo 
fixed a typo
 2014-11-04 06:21:08 -07:00
Roman Inflianskas
fb5e86aaa1 modules.linux_acl: satisfy pylint 2014-11-04 16:17:35 +03:00
Roman Inflianskas
83b760db44 modules.linux_acl: add integration tests 2014-11-04 14:45:23 +03:00
Roman Inflianskas
403a8b4cc9 modules.linux_acl: cleanup comments 2014-11-04 14:45:23 +03:00
Roman Inflianskas
b6cbb70e38 modules.linux_acl: add unit tests 2014-11-04 14:45:17 +03:00
Roman Inflianskas
8f409a4180 modules.linux_acl: add unit tests 2014-11-04 14:45:06 +03:00
Roman Inflianskas
16b4e2619f modules.linux_acl: raise exception on no files given; add unit tests 2014-11-04 14:44:44 +03:00
Misha Brukman
01615bf44b Removed "Supported commands" from header comment. 
The inline CLI usage comments in every function already provide sufficient
documentation for usage of each individual functionality, which are nicely
organized and rendered in the generated HTML docs:
http://docs.saltstack.com/en/latest/ref/clouds/all/salt.cloud.clouds.gce.html

Per discussion with module author (@erjohnso), dropping this comment block.
 2014-11-04 02:37:03 -05:00
pengyao
7fbe68495a fixed a typo 2014-11-04 15:14:06 +08:00
Matthew Williams
44a1639c65 Merge branch 'schedule' of github.com:mgwilliams/salt into schedule 2014-11-04 05:26:03 +00:00
Matthew Williams
303aacfd85 make schedule work with LazyLoader 2014-11-04 05:25:09 +00:00
Thomas S Hatch
0cc4b8e044 Merge pull request #17131 from thatch45/isbm-salt-xfs 
Merge #17111 with fixes
 2014-11-03 22:24:49 -07:00
Thomas S Hatch
c7e638842d Merge pull request #17120 from cachedout/issue_17000 
Move the scheduler to its own process
 2014-11-03 22:24:25 -07:00
Matthew Williams
0e5513be53 fix typo in comment 2014-11-04 04:57:30 +00:00
Thomas S Hatch
47f173833d Merge pull request #17128 from thatch45/ror6ax-drbd 
Merge #17072
 2014-11-03 21:12:55 -07:00
Thomas S Hatch
c3cd55c2b0 Merge pull request #17125 from dmyerscough/yubikey-authentication 
YubiKey Authentication
 2014-11-03 21:12:14 -07:00
Thomas S Hatch
4d362274a1 Merge pull request #17119 from rallytime/fix_ec2_cloud_test 
Fix ec2 cloud test
 2014-11-03 21:05:31 -07:00
Thomas S Hatch
e713723019 Merge pull request #17118 from jacksontj/2014.7-config 
Fix for an issue where re-started sub-processes would inherit
 2014-11-03 21:04:58 -07:00
Thomas S Hatch
e0904c5b17 Merge pull request #17114 from holmboe/man-clarify 
Some clarifications mainly in the Salt man page
 2014-11-03 21:02:33 -07:00