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,323 Commits 24 Branches 182 Tags 341 MiB
2c068718fa
Commit Graph

39323 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
C. R. Oldham
2c068718fa Merge remote-tracking branch 'upstream/2014.7' into develop 2014-11-04 15:45:00 -07:00
C. R. Oldham
3505ca2cc8 Merge branch 'develop' of github.com:saltstack/salt into develop 2014-11-04 15:44:16 -07:00
C. R. Oldham
af09c42451 Merge pull request #17174 from cro/zypp_doc 
Document that pkg.* on openSUSE needs python-zypp
 2014-11-04 15:35:36 -07:00
C. R. Oldham
64fa47960c pkg.* on openSUSE needs python-zypp installed 2014-11-04 15:35:10 -07:00
Thomas S Hatch
23d58132eb Merge branch '2014.7' into develop 2014-11-04 15:33:56 -07:00
Thomas S Hatch
1bcaa1fbff Merge pull request #17167 from s0undt3ch/hotfix/transifex-updates 
Update 'doc/.tx/config' - Build #196
 2014-11-04 15:33:21 -07:00
Thomas S Hatch
c7004aca20 Merge branch '2014.7' into develop 2014-11-04 15:22:06 -07:00
Thomas S Hatch
fd683a5ded Merge pull request #17170 from cro/zypp_doc 
Document that pkg.* on openSUSE needs python-zypp
 2014-11-04 15:21:41 -07:00
Thomas S Hatch
023e83529b Merge pull request #17171 from thatch45/bemehow-vpc_describe 
Merge #17136
 2014-11-04 15:20:04 -07:00
Thomas S Hatch
77966c56c1 ilint 2014-11-04 15:18:37 -07:00
C. R. Oldham
b51a821413 pkg.* on openSUSE needs python-zypp installed 2014-11-04 15:16:28 -07:00
Thomas S Hatch
8fcab999dd Merge branch 'vpc_describe' of https://github.com/bemehow/salt into bemehow-vpc_describe 2014-11-04 15:15:51 -07:00
Thomas S Hatch
b3d2edc9a5 Merge branch '2014.7' into develop 2014-11-04 15:11:23 -07:00
Thomas S Hatch
6e49163c88 Merge pull request #17156 from cachedout/issue_17105 
Update to new softwareproperties.ppa upstream changes
 2014-11-04 15:04:38 -07:00
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
Thomas S Hatch
b2b174066f Merge pull request #17154 from cachedout/overstate_dep 
Add deprecation warning to state.over
 2014-11-04 15:02:42 -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
Pedro Algarvio
a114dab27d Update 'doc/.tx/config' - Build #196 
http://cookingwithsalt.org/job/salt/job/transifex/196/

Signed-off-by: Pedro Algarvio <pedro@algarvio.me>
 2014-11-04 21:51:34 +00: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
Colton Myers
5c93de6ea1 Merge pull request #17157 from basepi/prereqdocs17086 
We evaluate a prereq, we don't call it. Fixes #17086
 2014-11-04 11:39:48 -07:00
Colton Myers
df0547969f We evaluate a prereq, we don't call it. Fixes #17086 2014-11-04 11:36:30 -07:00
Mike Place
ded8a02d5d Update to new softwareproperties.ppa changes 
Closes #17105
 2014-11-04 11:24:12 -07:00
Pedro Algarvio
1372d65a7c Copy setup.py from 2014.7. 
Fixes #17138
 2014-11-04 17:43:02 +00:00
Mike Place
2b08c753cb Add deprecation warning to state.over 2014-11-04 10:19:24 -07: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