Thomas S Hatch
67f0b88225
Bump man pages to 0.15.90
2013-06-21 15:18:17 -06:00
Thomas S Hatch
3c58e4c313
bump version to the RC number, 0.15.90
2013-06-21 15:04:53 -06:00
Thomas S Hatch
a3d6131eb8
Merge pull request #5679 from UtahDave/develop
...
Add some Windows info to the release notes.
2013-06-21 14:09:05 -07:00
David Boucha
2aca94856e
Add info on windows networking and other features
2013-06-21 15:04:48 -06:00
David Boucha
32a633d323
Add info about Windows Powershell in cmd
2013-06-21 14:43:17 -06:00
David Boucha
4453a32308
Add info about Windows templating fixes
2013-06-21 14:39:59 -06:00
Thomas S Hatch
d3adc9d11b
Add more features to the release notes
2013-06-21 14:34:22 -06:00
Thomas S Hatch
0201b25a4c
Merge pull request #5664 from olliewalsh/fix_issue_5637
...
Potential fix for issue #5637
2013-06-21 13:32:10 -07:00
Thomas S Hatch
a960696a40
Merge pull request #5676 from UtahDave/windows_defaults
...
Add Windows default config dir
2013-06-21 12:58:37 -07:00
David Boucha
a6e820c585
Add Windows default config dir
...
Fixes #4122
2013-06-21 12:31:09 -06:00
Thomas S Hatch
e8e9d15bbd
Fix for #5636
2013-06-21 12:10:17 -06:00
Thomas S Hatch
e7061fd5e4
Merge pull request #5675 from terminalmage/release_notes
...
fix hyperlink
2013-06-21 11:10:58 -07:00
Erik Johnson
5bff2dd783
fix hyperlink
2013-06-21 13:08:36 -05:00
Thomas S Hatch
e6832138a3
Merge pull request #5674 from terminalmage/release_notes
...
Begin new section on improved windows support
2013-06-21 11:04:48 -07:00
Erik Johnson
2c278c9cbf
Begin new section on improved windows support
2013-06-21 13:02:36 -05:00
Thomas S Hatch
3f40e79c46
change prereq to work with an any logic, not a all logic
...
per #5636
2013-06-21 11:49:27 -06:00
Thomas S Hatch
ff2b8874cd
Merge pull request #5673 from terminalmage/release_notes
...
Tweak documentation on random cron timing feature
2013-06-21 10:35:46 -07:00
Erik Johnson
f6dbadd6a1
Tweak documentation on random cron timing feature
2013-06-21 12:34:19 -05:00
Thomas S Hatch
292d56a3d8
Merge pull request #5672 from terminalmage/release_notes
...
Add info on confirmation prompt for salt-key -a/-A
2013-06-21 10:15:32 -07:00
Erik Johnson
3be572ff8a
Add info on confirmation prompt for salt-key -a/-A
2013-06-21 12:09:15 -05:00
Thomas S Hatch
86526de2e4
Merge pull request #5671 from terminalmage/quickfix
...
Improved mount state output
2013-06-21 09:49:50 -07:00
Erik Johnson
bd0a8f20c9
Improved mount state output
...
The states were not returning any information on whether or not the
mount was successful.
2013-06-21 11:24:58 -05:00
Thomas S Hatch
e9a3433aa5
Merge pull request #5663 from basepi/envconfig5631
...
Prioritize environmnt variable config location over default, Fix #5631
2013-06-21 08:25:00 -07:00
Thomas S Hatch
fca8d723c7
Merge pull request #5669 from zhangcheng/follow_up_fix_#5643
...
Follow up fix to #5643
2013-06-21 08:18:01 -07:00
ZHANG Cheng
a819d77fa6
Looks like a else clause is missing
2013-06-21 21:55:51 +08:00
David Boucha
5879bc2cce
Merge pull request #5666 from terminalmage/issue5603
...
Return empty string instead of False
2013-06-20 23:17:06 -07:00
Erik Johnson
27d2479327
Add error message if pecl fails to run
...
This will log an error that might help the user troubleshoot why pecl
failed to run.
2013-06-21 00:08:06 -05:00
Erik Johnson
704dd5bf18
Return empty string instead of False
...
This fixes #5603 . The return data from _pecl() is meant to be parsed
line by line, and you can't spilt a bool.
2013-06-21 00:04:28 -05:00
Joseph Hall
b07a9ed8c2
Merge pull request #5665 from terminalmage/docs
...
Document the SLS file namespace
2013-06-20 18:02:18 -07:00
Erik Johnson
323243332e
Document the SLS file namespace
2013-06-20 19:51:19 -05:00
Ollie Walsh
e681a3287f
Fix import issues
2013-06-21 01:09:05 +01:00
Ollie Walsh
ba07c3435f
Put console event handle in reachable code
2013-06-21 01:01:47 +01:00
Ollie Walsh
8a544ac2db
Revert "Catch and ignore CTRL_LOGOFF_EVENT when run as a windows service"
...
This reverts commit a7ddf81b37
2013-06-21 01:00:44 +01:00
David Boucha
38115562ee
Merge pull request #5660 from terminalmage/issue3495
...
Add confirmation step for salt-key -a/-A
2013-06-20 16:05:40 -07:00
David Boucha
4777a2b403
Merge pull request #5657 from terminalmage/issue5422
...
Make winrepo package names work for pkg states
2013-06-20 16:03:18 -07:00
Colton Myers
4fcfe2a620
Use default from DEFAULT_MASTER_OPTS instead of hard-coding
2013-06-20 16:51:53 -06:00
David Boucha
01ce3b73fd
Merge pull request #5661 from basepi/extpillardocs
...
Add example for ext_pillar in docs, Fix #5653
2013-06-20 15:50:54 -07:00
Colton Myers
5b4e545609
Prioritize -c over environment variable config
2013-06-20 16:47:15 -06:00
Colton Myers
507ce7e822
Prioritize environmnt variable config location over default, Fix #5631
2013-06-20 16:42:41 -06:00
Ollie Walsh
a7ddf81b37
Catch and ignore CTRL_LOGOFF_EVENT when run as a windows service
2013-06-20 23:35:16 +01:00
Colton Myers
59a549c662
Add example for ext_pillar in docs, Fix #5653
2013-06-20 15:32:56 -06:00
Colton Myers
7b84a2fe8d
Remove trailing whitespace
2013-06-20 15:29:59 -06:00
Erik Johnson
eedb50fd00
Add confirmation step for salt-key -a/-A
...
This implements #3495 .
2013-06-20 16:10:54 -05:00
Erik Johnson
dc4119aade
Remove __context__ from get_repo_data
...
This is causing a traceback in the pkg state. Will have to figure out
how to fix this.
2013-06-20 14:45:09 -05:00
Erik Johnson
d8a4b57cbb
Make winrepo package names work for pkg states
...
This adds a reverse name map to the repo data that is created by the
winrepo.genrepo runner, and removes some windows-specific code from the
pkg state since we no longer have to work around the fact that winrepo
packages are discovered with their full names.
2013-06-20 14:34:44 -05:00
David Boucha
d6b87c2d77
Merge pull request #5656 from cvrebert/patch-1
...
auth.pam: avoid relying upon NameError
2013-06-20 11:49:05 -07:00
Chris Rebert
a7b89a4e08
auth.pam: avoid relying upon NameError
2013-06-20 12:46:39 -06:00
Joseph Hall
438f08b784
Merge pull request #5655 from cvrebert/patch-2
...
s3fs: envs => environments, to avoid shadowing envs() func
2013-06-20 11:38:23 -07:00
Chris Rebert
dd63259837
s3fs: envs => environments, to avoid shadowing envs() func
2013-06-20 11:31:36 -07:00
Thomas S Hatch
6e4ed700a3
Merge pull request #5654 from stribert/develop
...
Fixes issue #5652
2013-06-20 11:09:25 -07:00
