micahhausler
5ff721b3ed
Fixed error in ext_pillar() params
...
The minion_id param was not necessisary and was causing errors.
I also updated the docs to properly evaluate the yaml, and added
additional exception handling.
2013-09-23 13:17:27 -04:00
mlister2006
2ecaddb484
Adding master side acl support for mine.get
2013-09-23 12:00:19 -04:00
mlister2006
62b10849cd
Adding file:// URL support for salt mako template lookup
...
Adding file:// URL support to lookup mako templates on local file
system...
If mako templates are already present on a local file system on a
minion, it can use file:// URL to lookup a local copy. This in addition
to salt:// url support that is already present, which fetches a copy
from a salt server.
2013-09-23 11:48:03 -04:00
Pedro Algarvio
3a4e16a19a
Merge pull request #7415 from terminalmage/docs
...
Fix typo
2013-09-23 07:58:07 -07:00
Erik Johnson
e685ebe23f
Fix typo
2013-09-23 09:55:56 -05:00
Pedro Algarvio
ac84094e1f
Fix pep8 E302 issue
2013-09-23 10:37:18 +01:00
Pedro Algarvio
b60c5b065e
Merge pull request #7405 from terminalmage/issue7371
...
Don't make pkg/service states available unless provider module is loaded
2013-09-23 02:16:05 -07:00
Adam Bolte
2b47fb7880
git state to update repo where rev = branch name
2013-09-23 15:23:01 +10:00
Joseph Hall
7b87ae9a0c
Merge pull request #7408 from terminalmage/docs
...
fix sphinx build warning due to invalid RST
2013-09-22 19:49:55 -07:00
Erik Johnson
771c54c627
fix sphinx build warning due to invalid RST
2013-09-22 21:49:12 -05:00
Joseph Hall
15b4f44363
Merge pull request #7407 from techhat/novafix
...
Add suspend, resume, lock to openstack nova
2013-09-22 19:40:15 -07:00
Joseph Hall
b23a8b00ad
Add suspend, resume, lock to openstack nova
2013-09-22 20:38:45 -06:00
Joseph Hall
f6d3c84c44
Merge pull request #7406 from terminalmage/docs
...
Add note on pkg/service states not working to FAQ
2013-09-22 19:36:59 -07:00
Erik Johnson
8233587cea
Add note on pkg/service states not working to FAQ
...
Also fixed a typo in an RST directive.
2013-09-22 21:32:16 -05:00
Erik Johnson
45e3213c43
Don't make pkg/service states available unless provider module is loaded
...
This prevents ugly tracebacks when an OS does is not properly detected,
and no pkg or service provider was loaded for the minion. pkg and
service states will still fail, but they'll fail more gracefully,
without the traceback.
2013-09-22 20:55:56 -05:00
Thomas S Hatch
9c3f3b1c2e
Merge pull request #7400 from evinrude/develop
...
Symlink functionality in the default file server roots
2013-09-22 16:08:03 -07:00
Pedro Algarvio
004fb2ab6c
Merge pull request #7401 from aboe76/suse_installation_docs
...
Updated suse installation documentation
2013-09-22 07:06:39 -07:00
Mickey Malone
e4b794aab3
Return the relative path of the symlink, not the full path
2013-09-22 08:22:46 -05:00
Mickey Malone
b4cf7abaf9
Merge remote-tracking branch 'upstream/develop' into develop
2013-09-22 07:58:43 -05:00
Niels Abspoel
314f5724cc
Updated suse installation documentation
...
With upcoming opensuse 13.1 release and the release of
Suse Linux Enterprise 11 SP3 it was time to update the documentation
2013-09-22 13:06:27 +02:00
Pedro Algarvio
ef205a228e
Merge pull request #7402 from gatoralli/develop
...
Fixed typo
2013-09-22 03:09:47 -07:00
Jason Sommer
10ac786169
Fixed typo
2013-09-22 01:06:50 -05:00
Mickey Malone
2aae1f8ca8
Not needed
2013-09-21 14:14:30 -05:00
Mickey Malone
a4e23a410a
Give the symlink function more clarity
2013-09-21 13:36:18 -05:00
Seth House
3c972215b1
Fixed a few cross-reference links for file.replace
2013-09-21 12:26:50 -06:00
Erik Johnson
ac5b5178bf
Mask module aliases for freebsdpkg, pkgng modules
2013-09-21 12:01:47 -05:00
Erik Johnson
3b3255ddc4
Add new mac user/group modules to toctree
2013-09-21 12:01:47 -05:00
Erik Johnson
481e9a7533
Make docstring point to internal docs for remove func
2013-09-21 12:01:47 -05:00
Erik Johnson
bd65b5dda4
Update pkg state to work with freebsd jails
2013-09-21 12:01:47 -05:00
Erik Johnson
211274d17b
Rewrite pkgng module
2013-09-21 12:01:47 -05:00
Erik Johnson
cd2bde176c
Rewrite freebsdpkg module
2013-09-21 12:01:47 -05:00
Pedro Algarvio
fe94366271
Typo
2013-09-21 17:32:40 +01:00
Pedro Algarvio
af3a0d6be6
Can't exit on the commands.
2013-09-21 17:26:55 +01:00
Thomas S Hatch
4cf9392b11
Merge pull request #7397 from s0undt3ch/develop
...
single .pylintrc & travis code lint checks
2013-09-21 09:23:51 -07:00
Thomas S Hatch
824b8d1bde
Merge pull request #7396 from jahkeup/keystone-connectionargs
...
Fix missing connection_args for user_present's role logic.
2013-09-21 09:21:30 -07:00
Pedro Algarvio
a77e41b80f
Use a single .pylintrc file. Execute code lint checks on Travis but don't fail because of them.
2013-09-21 17:18:03 +01:00
Thomas S Hatch
2cd645aec5
Merge pull request #7394 from s0undt3ch/issues/4543
...
Do not reset system locale to C when running the command. Fixes #4543 .
2013-09-21 08:57:56 -07:00
Pedro Algarvio
f041137e22
Merge pull request #7387 from terminalmage/loader_fix
...
Fix cross-calling provider overrides
2013-09-21 08:13:22 -07:00
Pedro Algarvio
bc41880f6a
Do not reset system locale to C when running the command. Fixes #4543 .
2013-09-21 16:07:29 +01:00
Mickey Malone
c3963a7eeb
Added symlink functionality to the roots backend fileserver
2013-09-21 09:30:06 -05:00
Joseph Hall
07233a44b4
Merge pull request #7392 from s0undt3ch/hotfix/lint
...
Fix `pep8` `E302` issues
2013-09-21 07:24:45 -07:00
Pedro Algarvio
252ffc9367
Fix pep8 E302 issues
2013-09-21 15:17:30 +01:00
Joseph Hall
1e913ee7b2
Merge pull request #7391 from s0undt3ch/hotfix/git-current-branch-cli-example
...
Add example to `git.latest_branch`
2013-09-21 06:54:01 -07:00
Joseph Hall
568b3007f0
Merge pull request #7389 from s0undt3ch/hotfix/lint
...
Some lint fixes
2013-09-21 06:37:53 -07:00
Jacob Vallejo
c9d44428b3
Fix missing connection_args for user_present's role logic.
2013-09-21 08:56:14 -04:00
Pedro Algarvio
15ceed965a
Add example to git.latest_branch
2013-09-21 11:11:51 +01:00
Pedro Algarvio
979d548d3a
Merge pull request #7390 from s0undt3ch/hotfix/fix-runas-tests
...
Fix `unit.states.rvm_test.TestRvmState.test_installed`
2013-09-21 03:01:35 -07:00
Pedro Algarvio
7ae519c34e
Fix unit.states.rvm_test.TestRvmState.test_installed
2013-09-21 10:42:34 +01:00
Pedro Algarvio
c3c7a08a40
Commas not followed by a space.
2013-09-21 10:39:44 +01:00
Pedro Algarvio
2a7c60653d
Add missing **connection_args
2013-09-21 10:38:43 +01:00
