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,343 Commits 24 Branches 182 Tags 341 MiB
1b2e16a19e
Commit Graph

39343 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pedro Algarvio
1b2e16a19e Merge branch '2014.7' into develop 2014-11-05 22:47:06 +00:00
Nicole Thomas
f26fa79ff2 Merge pull request #17213 from s0undt3ch/hotfix/freeze-configs-delayed 
Freeze the testing runtime configs at a latter stage
 2014-11-05 15:45:24 -07:00
Pedro Algarvio
5da3ad341b Freeze the testing runtime configs at a latter stage 2014-11-05 22:42:38 +00:00
Joseph Hall
e5c2ddea7a Merge pull request #17206 from arubis/patch-2 
Correct data in /srv/reactor/startup_highstate.sls
 2014-11-05 14:22:17 -07:00
Dylan Fitzgerald
611baf468a Correct data in /srv/reactor/startup_highstate.sls 
data['id'] does not exist; data['name'] does. revise example sls to render correctly.
 2014-11-05 13:23:43 -07:00
Joseph Hall
efe4fbd864 Merge pull request #17201 from mgwilliams/sdb_memcache 
memcached sdb module - it's not "Salt DB"
 2014-11-05 12:31:32 -07:00
Matthew Williams
183e0090f9 fix a "typo" 2014-11-05 19:29:38 +00:00
Joseph Hall
a815df7c09 Merge pull request #17199 from cvrebert/patch-1 
pillar/file_tree.py: fix typo: "paramater" [sic]
 2014-11-05 12:15:42 -07:00
Chris Rebert
dbaef96298 pillar/file_tree.py: fix typo: "paramater" [sic] 2014-11-05 11:14:43 -08:00
Mike Place
8b2fee6fe0 Merge pull request #17197 from cvrebert/patch-1 
tests/unit/utils/event_test.py: fix typo in comment
 2014-11-05 12:05:21 -07:00
Chris Rebert
c46e43f296 tests/unit/utils/event_test.py: fix typo in comment 2014-11-05 11:03:54 -08:00
Colton Myers
b142a47109 Merge pull request #17187 from saltstack/revert-17120-issue_17000 
Revert "Move the scheduler to its own process"
 2014-11-05 11:31:59 -07:00
Colton Myers
cf45d1051d Merge branch '2014.7' into develop 2014-11-05 11:28:20 -07:00
Colton Myers
a4736d5cdd Merge pull request #17195 from basepi/2014.7releasenotes 
Add note to release notes about pillar/compound matching in mine/publish
 2014-11-05 11:27:54 -07:00
Colton Myers
4149716bf2 Add note to release notes about pillar/compound matching in mine/publish 2014-11-05 11:27:23 -07:00
Joseph Hall
221e8b5e34 Merge pull request #17186 from viraptor/set_policy_comment 
Add example for iptables policy
 2014-11-05 08:32:01 -07:00
Stanisław Pitucha
7a084f3c5b Add example for iptables policy 
Add a missing example of iptables.set_policy. Also mention the `policy`
parameter explicitly in the documentation since there is no long option
equivalent in the iptables man page.
 2014-11-06 01:22:21 +11:00
Nicole Thomas
fbf8e5be0e Revert "Move the scheduler to its own process" 2014-11-05 07:04:09 -07:00
Pedro Algarvio
b8126605b2 Merge pull request #17183 from skosmalla/doc-grains-fix 
fix syntax error in writing grains code snippet
 2014-11-05 13:39:07 +00:00
Sandra Kosmalla
de5baa14a2 fix syntax error in writing grains code snippet 2014-11-05 11:33:14 +01:00
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