Joseph Hall
3c1a574d47
Merge pull request #14168 from s0undt3ch/hotfix/remove-syslog-ng
...
Remove syslog-ng tests. Refs #14163
2014-07-13 09:17:18 -06:00
Pedro Algarvio
cb3d82bbd2
Merge pull request #14174 from UtahDave/develop
...
make docs reflect argument order in function spec
2014-07-13 11:14:34 +01:00
David Boucha
a8a1334a1d
make docs reflect argument order in function spec
2014-07-13 02:36:29 -06:00
David Boucha
8992ee5da1
Merge pull request #14172 from UtahDave/develop
...
make sure twilio_notify shows up in the docs
2014-07-13 00:13:20 -06:00
David Boucha
a04e3d4a0b
make sure twilio_notify shows up in the docs
2014-07-13 00:12:23 -06:00
David Boucha
66c55704e6
Merge pull request #14171 from UtahDave/develop
...
add links to 2014.1.7 Salt Windows installers
2014-07-12 23:21:57 -06:00
David Boucha
98b7c1cdfd
add links to 2014.1.7 Salt Windows installers
2014-07-12 23:21:06 -06:00
David Boucha
357283717f
Merge pull request #14170 from UtahDave/develop
...
bump windows installer version
2014-07-12 23:19:50 -06:00
David Boucha
ea12719881
bump windows installer version
2014-07-12 23:18:58 -06:00
Joseph Hall
a2cbd18b7f
Merge pull request #14169 from s0undt3ch/hotfix/transifex-updates
...
Update 'doc/.tx/config' - Build #111
2014-07-12 22:26:23 -06:00
Pedro Algarvio
8c756836f2
Update 'doc/.tx/config' - Build #111
...
http://cookingwithsalt.org/job/salt/job/transifex/111/
Signed-off-by: Pedro Algarvio <pedro@algarvio.me>
2014-07-13 00:43:56 +01:00
Pedro Algarvio
7862600683
Remove syslog-ng tests. Refs #14163
2014-07-13 00:09:45 +01:00
Thomas S Hatch
4232835ee8
Merge pull request #14165 from saltstack/revert-14137-lxc
...
Revert "lxc refactor"
2014-07-12 11:38:16 -06:00
Thomas S Hatch
7e54d0fa20
Revert "lxc refactor"
2014-07-12 11:38:03 -06:00
Thomas S Hatch
e8e6211fe8
Merge pull request #14163 from terminalmage/move-syslog-ng-to-salt-contrib
...
Remove syslog_ng state/module, moving to salt-contrib
2014-07-12 10:49:32 -06:00
Erik Johnson
5a71057d29
Remove syslog_ng state/module, moving to salt-contrib
2014-07-12 11:36:17 -05:00
Thomas S Hatch
c767fc3f1e
Merge pull request #14160 from terminalmage/style-fixes
...
Style fixes
2014-07-12 10:32:10 -06:00
Erik Johnson
6b8a4a57f0
Style fixes
...
Single quotes, plus fixed an apparent bug where "name" was passed as a
quoted string instead of a variable.
2014-07-12 10:07:54 -06:00
Pedro Algarvio
1772b40ecd
Merge pull request #14139 from rallytime/batch_test
...
A couple of batch unit tests
2014-07-12 00:06:40 +01:00
Joseph Hall
78441afc0b
Merge pull request #14151 from hulu/intro-scale-doc-copyedit
...
fix typos in doc/topics/tutorials/intro_scale.rst
2014-07-11 16:49:21 -06:00
Chris Rebert
a016a30508
fix typos in doc/topics/tutorials/intro_scale.rst
2014-07-11 15:46:54 -07:00
Thomas S Hatch
49ec979943
Merge pull request #14149 from hulu/syslog-ng-buffer-shadow
...
avoid shadowing built-in `buffer` type in states.syslog_ng._build_config
2014-07-11 16:31:12 -06:00
Chris Rebert
58c1742fa1
avoid shadowing built-in buffer type in states.syslog_ng._build_config
...
rename local var: buffer => buf
2014-07-11 15:25:20 -07:00
Joseph Hall
e2ae595818
Merge pull request #14147 from hulu/syslog-ng-type-shadowing
...
avoid shadowing 'type' built-in in states.syslog_ng
2014-07-11 16:19:49 -06:00
Chris Rebert
a2c98169f3
avoid shadowing 'type' built-in in states.syslog_ng._is_all_element_has_type
2014-07-11 15:17:55 -07:00
Thomas S Hatch
1d70773122
Merge pull request #14146 from cvrebert/patch-1
...
fix typo in modules.file.replace() docstring
2014-07-11 16:13:14 -06:00
Chris Rebert
22a66f2214
fix typo in modules.file.replace() docstring
...
************* Module salt.modules.file
salt/modules/file.py:1020: [W1401(anomalous-backslash-in-string), ] Anomalous backslash in string: '\s'. String constant might be missing an r prefix.
2014-07-11 15:12:21 -07:00
rallytime
010f942dc8
Pylint fix, again.
2014-07-11 16:02:06 -06:00
Thomas S Hatch
15143e9677
Merge pull request #14145 from terminalmage/flo-fixes
...
Couple ioflo fixes
2014-07-11 16:01:29 -06:00
Thomas S Hatch
9baad25459
Merge pull request #14142 from eliasp/typo-checkif-checkin
...
Typo (checkif → checking).
2014-07-11 16:01:13 -06:00
Thomas S Hatch
57f519565b
Merge pull request #14141 from rallytime/docs_fix
...
Fix show_full_context example
2014-07-11 16:00:40 -06:00
Thomas S Hatch
1e5a545c8c
Merge pull request #14137 from mgwilliams/lxc
...
lxc refactor
2014-07-11 16:00:06 -06:00
rallytime
2523d8c641
Mock LocalClient in batch unit tests
2014-07-11 15:38:34 -06:00
Mike Place
b48b99ca72
Merge pull request #14144 from rallytime/swap_docs_fix
...
Add note that mount.swap state doesn't support LABEL
2014-07-11 15:34:57 -06:00
Thomas S Hatch
da2f3543fd
Skip gitfs tests
...
These are running in an incosistent way, all of our local tests pass
2014-07-11 15:17:58 -06:00
Erik Johnson
9017800cdb
Continue if action did not match
...
Speeds up action by processing other queued actions instead of returning
2014-07-11 14:51:35 -06:00
Erik Johnson
ebf7e984ae
Replace 'go next' with explicit frame target
2014-07-11 14:49:38 -06:00
rallytime
c12b636bf1
Add note that mount.swap state doesn't support LABEL
2014-07-11 14:32:34 -06:00
Elias Probst
9b53f15c41
Typo (checkif → checking).
2014-07-11 22:26:00 +02:00
rallytime
c61a1eeb20
Pylint fix
2014-07-11 14:09:24 -06:00
rallytime
5fb0345a8d
Fix show_full_context example
2014-07-11 14:04:46 -06:00
Colton Myers
5fef5ef015
Merge pull request #14140 from cachedout/doc_fix
...
Typo in file.managed doc
2014-07-11 14:00:53 -06:00
Mike Place
e31339c41d
Typo in file.managed doc
2014-07-11 13:56:22 -06:00
rallytime
2783249931
Remove line
2014-07-11 13:55:56 -06:00
rallytime
bc155127a3
A couple of batch unit tests
2014-07-11 13:54:35 -06:00
Matthew Williams
fe1a861ace
modules.lxc: remove commented code
2014-07-11 19:20:59 +00:00
Matthew Williams
71e1522c08
WIP: continue restructure of modules.lxc
2014-07-11 19:17:55 +00:00
Matthew Williams
3a0263d551
WIP: lxc restructure
2014-07-11 18:28:37 +00:00
Thomas S Hatch
4e16ba5525
only load oracle module if the deps are there
2014-07-11 12:17:24 -06:00
Thomas S Hatch
de575181e8
Merge pull request #14134 from aboe76/suse_rpm_spec
...
updated suse spec file for 2014.1.7
2014-07-11 12:02:12 -06:00
