Thomas S Hatch
1fe0015c90
update pillar docs
2013-02-05 11:07:44 -07:00
Thomas S Hatch
03b9ad2727
should match basestring
2013-02-05 00:30:07 -07:00
Thomas S Hatch
f36b93695e
Merge pull request #3588 from kjkuan/fix_getting_file_client
...
Make getting the fileclient a bit more robust and remove unused PILLAR var.
2013-02-04 19:52:36 -08:00
Jack Kuan
b8a151cb7b
Make getting the fileclient a bit more robust and remove unused PILLAR
...
variable.
2013-02-04 22:07:41 -05:00
Thomas S Hatch
a4dc38880f
Fixed crazy sauce....
2013-02-04 13:52:24 -07:00
Thomas S Hatch
436012aeb8
Fix #3579
...
salt 'node' state.sls pillar=$(cat /some/yamlorjson/file)
2013-02-04 13:43:03 -07:00
Thomas S Hatch
2073fa2700
Allow pillar data to be passed into the State compiler directly
2013-02-04 13:43:03 -07:00
Thomas S Hatch
44fad39080
Merge pull request #3586 from MTecknology/develop
...
Changed log level from exception to warning.
2013-02-04 12:40:37 -08:00
Thomas S Hatch
f4005c0e0f
Merge pull request #3546 from kjkuan/pydsl_include
...
Add support for #3483
2013-02-04 11:58:22 -08:00
Michael Lustfield
6f1a72eaf6
Changed log level from exception to warning.
2013-02-04 13:50:24 -06:00
Thomas S Hatch
5064a6348d
Merge pull request #3585 from MTecknology/develop
...
Added log when debconf-utils is not installed on a Debian system.
2013-02-04 11:46:53 -08:00
Michael Lustfield
547e923756
Added log when debconf-utils is not installed on a Debian system.
2013-02-04 13:45:11 -06:00
Seth House
3c60e9a3c4
Merge pull request #3584 from techhat/repodocs
...
Adding documentation for pkg (repos) and lowpkg
2013-02-04 11:29:12 -08:00
Joseph Hall
28c5d4a306
Adding documentation for pkg (repos) and lowpkg
2013-02-04 12:18:12 -07:00
Thomas S Hatch
8404f29faf
This has been refactored since I wrote the TODO over a year ago
...
Also make the command missing execution get skipped on windows,
this still needs to be skipped on ARM per #3576
2013-02-04 12:18:03 -07:00
Thomas S Hatch
f37a1ca226
Merge pull request #3582 from l2ol33rt/develop
...
Fix for Oracle Linux os grains definitions
2013-02-04 11:12:26 -08:00
Robert Hernandez
05d143cbfc
Fix for Oracle Linux os grains definitions
2013-02-04 10:13:54 -08:00
David Boucha
c603b2bad2
Merge pull request #3573 from techtonik/patch-1
...
Fix easy_install'ation on Windows
2013-02-04 09:56:20 -08:00
David Boucha
67f99d9140
Merge pull request #3580 from sontek/M2Crypto-docs
...
added information about the fedora_setup.sh script M2Crypto provides
2013-02-04 09:32:16 -08:00
John Anderson
6a36966d57
added information about the fedora_setup.sh script M2Crypto provides
2013-02-04 12:29:32 -05:00
Thomas S Hatch
04a4ce45a6
Add comment on why this yaml.load ref is safe
2013-02-04 10:23:51 -07:00
Thomas S Hatch
a411a5b147
Merge pull request #3578 from jaustinpage/add-token-auth-to-keystone
...
Add token auth to keystone
2013-02-04 08:54:11 -08:00
Thomas S Hatch
9e1001cb3b
Fix some spelling
2013-02-04 09:40:21 -07:00
Thomas S Hatch
a7235189a6
Use is_windows
2013-02-04 09:35:43 -07:00
Austin Page
df1550b5d5
Fixing documentation
2013-02-04 11:31:30 -05:00
Austin Page
338a48c207
Adding token based authentication to keystone for bootstrapping keystone configs.
2013-02-04 11:19:48 -05:00
Thomas S Hatch
2ea81d0bf1
Switch overtstate system to use yaml.safe_load
2013-02-03 20:45:47 -07:00
Thomas S Hatch
6082f8806a
Merge pull request #3570 from s0undt3ch/develop
...
Catch `ValueError` when trying to raise the max open files setting. Refs #1991
2013-02-03 19:32:19 -08:00
anatoly techtonik
f617888bb4
Fix easy_install'ation on Windows
...
There is no 'wmi' package on PyPI.
2013-02-04 01:14:57 +03:00
Joseph Hall
207c9aeb93
Merge pull request #3571 from viq/patch-2
...
Make comment reflect reality
2013-02-03 14:00:34 -08:00
Erik Johnson
d165d9619d
Merge pull request #3572 from archtaku/docs
...
Replace hard-coded links w/relative ":mod:" links
2013-02-03 12:59:54 -08:00
Erik Johnson
d4b120a003
Replace hard-coded links w/relative ":mod:" links
2013-02-03 14:54:04 -06:00
viq
dfe55f60a4
Make comment reflect reality
...
freebsd_sysctl "Only run on Linux systems" ? I think not.
2013-02-03 21:10:54 +01:00
Pedro Algarvio
33227c5b3e
Catch ValueError when trying to raise the max open files setting. Fixes #1991 .
...
Under some occasions, the current default of 100000 max open files setting is too high. Properly catch that exception and warn the users about it.
See https://github.com/saltstack/salt/issues/1991#issuecomment-13025595
2013-02-03 19:23:25 +00:00
Erik Johnson
b559cb2eda
Merge pull request #3569 from archtaku/docs
...
add package provider documentation
2013-02-02 19:36:04 -08:00
Erik Johnson
16f83aced9
add package provider documentation
2013-02-02 21:34:26 -06:00
Thomas S Hatch
65d4d84295
Docs per #3543
2013-02-02 15:47:04 -07:00
Thomas S Hatch
eb273a04fa
Merge pull request #3567 from s0undt3ch/develop
...
Drop recently added JUnit report support.
2013-02-02 12:15:33 -08:00
Thomas S Hatch
2494525ab5
Merge pull request #3562 from smcquay/osx-say
...
Osx say
2013-02-02 12:14:37 -08:00
Thomas S Hatch
04bf9065b3
Merge pull request #3561 from smcquay/ctags
...
Ignore file created by ctags -R
2013-02-02 12:13:28 -08:00
Thomas S Hatch
25c2bc06d6
Some tense fixes, @smcquay I imagine you could still flower this up
...
a bit
2013-02-02 13:12:15 -07:00
Thomas S Hatch
57df3b79c4
Merge pull request #3560 from smcquay/docs
...
Notes for things I had to do on my OS X laptop.
2013-02-02 12:07:28 -08:00
Thomas S Hatch
d6a1e78a0e
Merge pull request #3565 from dahpgjgamgan/develop
...
SIGCHLD handler attached only when multiprocessing is enabled
2013-02-02 12:05:57 -08:00
Pedro Algarvio
8f851e0a9a
Renamed environment variable and create directory if it does not exit.
...
New environment variable name is `SALT_XML_TEST_REPORTS_DIR`.
2013-02-02 18:27:59 +00:00
Pedro Algarvio
6efbc51aae
Remove bad xml reports option.
...
* `xmlrunner` proved to be a way better choice than `junitxml` and it's even parsable by Bamboo. The output of `junitxml` is not.
* The output directory can be tweaked with the environment variable `SALT_XML_TEST_REPORTS`.
2013-02-02 18:22:31 +00:00
Joseph Hall
d11d419155
Merge pull request #3563 from mchesnut/develop
...
syntax fix for the timezone.system example
2013-02-02 06:15:07 -08:00
Joseph Hall
da3c95ffb8
Merge pull request #3566 from benhosmer/develop
...
#3556 from darkwyrm adding mint support
2013-02-02 04:39:49 -08:00
Ben Hosmer
6d19da6dc7
#3556 from darkwyrm adding mint support
2013-02-02 07:27:53 -05:00
Jan Duzinkiewicz
7ec79bb262
SIGCHLD handler attached only when multiprocessing is enabled and platform is not windows
2013-02-02 12:52:56 +01:00
Mike Chesnut
2e842ced81
syntax fix for the timezone.system example
2013-02-02 00:27:12 -08:00
