Commit Graph

29552 Commits

Author SHA1 Message Date
Pedro Algarvio
f3e86b16c8 Bump deprecations to Lithium 2014-04-24 09:02:58 +01:00
Pedro Algarvio
87a3f8f234 We can remote this logic since string now include the codename. 2014-04-24 08:59:45 +01:00
Pedro Algarvio
67d9a2235e Bump deprecations to Lithium 2014-04-24 08:57:43 +01:00
Pedro Algarvio
dc0ad60eac Bump deprecations to Lithium 2014-04-24 08:57:14 +01:00
Pedro Algarvio
16075bfc97 Bump deprecations to Lithium 2014-04-24 08:56:41 +01:00
Pedro Algarvio
e88e836e1b Bump deprecations to Lithium 2014-04-24 08:56:08 +01:00
Thomas S Hatch
87f53ee3f3 Append.... 2014-04-24 00:57:58 -06:00
Thomas S Hatch
64a96565db update the rootfs in the lxc config 2014-04-24 00:53:28 -06:00
Thomas S Hatch
eccc0c580d Merge pull request #12218 from s0undt3ch/issues/12205-invlude-version-codename
Include version codename in generated version string
2014-04-23 17:24:55 -06:00
Thomas S Hatch
316995794d Merge pull request #12239 from sandbender/fix_iptables_dport_and_sport
Fix iptables dport and sport
2014-04-23 14:27:42 -06:00
Thomas S Hatch
e232b12cf4 Merge pull request #12238 from sandbender/adding_require_to_mysql_grant
Support for REQUIRE <SSL, etc> in mysql_grants state
2014-04-23 14:26:41 -06:00
Thomas S Hatch
c53519d2fa Merge pull request #12236 from techhat/github
Retrieve pubkeys from github api
2014-04-23 14:23:38 -06:00
Colton Myers
696eeb5ff1 Merge pull request #12240 from rallytime/pkgng_reinstall_requires
Change require kwarg in pkg.install to reinstall_requires
2014-04-23 14:21:04 -06:00
Thomas S Hatch
11a955e66f Merge pull request #12227 from tmartinfr/psql-clean-env
Clean environment before calling psql
2014-04-23 14:11:33 -06:00
Thomas S Hatch
1584dd6666 Merge pull request #12203 from lyft/boto-iam
Initial commit of boto_iam module and state
2014-04-23 14:05:51 -06:00
Thomas S Hatch
ff30f81933 Merge pull request #12135 from jacksontj/job_cache
Master_job_caches
2014-04-23 13:55:51 -06:00
Thomas S Hatch
207423f869 Merge pull request #12133 from fivethreeo/develop
New locale modules and states
2014-04-23 13:28:58 -06:00
Ryan Lane
a23c5236b0 Lint fix for boto_iam_role state 2014-04-23 11:40:04 -07:00
Rudy X. Desjardins
bb9c1f72c4 Tiny fix for iptables... a recent change broke certain usage of dport(s) and sport(s) when the value is an int (code prior to this commit assumes it is a string and tries to call .startswith(..) on it). 2014-04-23 14:03:15 -04:00
rallytime
32fab20a85 Change require kwarg in pkg.install to reinstall_requires 2014-04-23 12:01:50 -06:00
Ryan Lane
e153f12b2c Followup fixes for boto_iam 2014-04-23 10:55:36 -07:00
Rudy X. Desjardins
e950af011e Merge branch 'develop' of github.com:saltstack/salt into develop 2014-04-23 13:48:21 -04:00
Joseph Hall
126f3ae9fe Merge pull request #12235 from gtmanfred/cloud
Minion is not always defined in the profile
2014-04-23 11:46:19 -06:00
Rudy X. Desjardins
5f8e54c550 Adds support for REQUIRE <SSL, etc> to mysql_grants state - Satisfies request (issue) #5778. 2014-04-23 13:42:47 -04:00
Joseph Hall
9c7f03ee0c Linting 2014-04-23 11:41:24 -06:00
Joseph Hall
7497bc8ece Remove unused pprint 2014-04-23 10:54:07 -06:00
Joseph Hall
a8270f418f Retrieve pubkeys from github api 2014-04-23 10:53:11 -06:00
Daniel Wallace
1d2fd37ff2 minion is not always defined in the profile 2014-04-23 11:08:01 -05:00
Mike Place
2fbf1975c3 Merge pull request #12233 from terminalmage/wording-tweak
Tweak wording for successful orch w/no changes
2014-04-23 09:28:19 -06:00
Erik Johnson
041bda018d Tweak wording for successful orch w/no changes
This changes an awkwardly-worded comment when the state.orchestrate
runner is executed and there are no changes to be made.
2014-04-23 10:20:20 -05:00
Pedro Algarvio
993eb7b670 Merge pull request #12226 from terminalmage/issue9001
Pass through arguments in lvs.zero
2014-04-23 15:55:23 +01:00
Thomas Martin
70bbe73208 Clean environment before calling psql
If environment variables are not cleaned, the psql execution can be
affected by variables like PGHOST, and induce unwanted behaviours or
failures.  Especially on Linux if one launches salt-minion by invoking
directly the init script instead of using the "service" command (the
former does not clean the environment).
2014-04-23 16:03:11 +02:00
Pedro Algarvio
343b53cdf5 Merge pull request #12221 from techhat/issue11934
Correctly check for a terminated state
2014-04-23 15:01:05 +01:00
Erik Johnson
71013fbc32 Pass through arguments in lvs.zero
Fixes #9001.
2014-04-23 08:55:06 -05:00
Joseph Hall
cbbe347dcd Correctly check for a terminated state 2014-04-23 07:29:56 -06:00
Joseph Hall
14f2f4ca41 Merge pull request #12220 from Gyroplast/patch-1
Fix typo in Type declaration of systemd unit
2014-04-23 07:14:12 -06:00
Joseph Hall
3182395267 Merge pull request #12208 from vexxhost/develop
Added documentation for VEXXHOST cloud
2014-04-23 07:12:24 -06:00
Dennis Herbrich
f1a8a538fc Fix typo in Type declaration of systemd unit
The systemd service type must be declared in lower case, otherwise systemd generated a warning and ignores the declaration.
2014-04-23 15:11:00 +02:00
Joseph Hall
cd1104a976 Merge pull request #12215 from makinacorpus/lenny
service: support for sarge,lenny
2014-04-23 07:09:14 -06:00
Pedro Algarvio
98b52748f8 Include version codename in the generated version string.
Fixes #12205.
2014-04-23 13:30:41 +01:00
Pedro Algarvio
a637c8a35a Add attribute which will allow release names match by version. 2014-04-23 13:30:41 +01:00
Pedro Algarvio
ca53ae421e Explain how version bumps should be made 2014-04-23 13:30:41 +01:00
Pedro Algarvio
2fbc3460e1 Hydrogen has been released, update version. 2014-04-23 13:30:41 +01:00
Pedro Algarvio
a564874bb0 Since we now include the code name, check for presence of the commit info instead. 2014-04-23 13:25:43 +01:00
Mathieu Le Marec - Pasquet
4c53cd5dc6 pylint fix 2014-04-23 13:20:55 +02:00
Pedro Algarvio
16d975c691 Merge pull request #12214 from s0undt3ch/hotfix/transifex-updates
Hotfix/transifex updates
2014-04-23 12:18:38 +01:00
Mathieu Le Marec - Pasquet
56d15e4493 service: support for sarge,lenny 2014-04-23 12:56:03 +02:00
Jenkins
87a3e74045 Update 'doc/.tx/config' - Build #30
http://cookingwithsalt.org/job/salt/job/develop/job/transifex/30/

Signed-off-by: Pedro Algarvio <pedro@algarvio.me>
2014-04-23 11:36:32 +01:00
Pedro Algarvio
68111e2cf9 Remove from list on success. 2014-04-23 11:36:31 +01:00
Pedro Algarvio
014bcc59f2 Merge pull request #12210 from terminalmage/docs
Fix bad docstrings
2014-04-23 08:52:54 +01:00