Nicole Thomas
025bff2bf0
Merge pull request #28548 from nmadhok/2015.5-task-error
...
[Backport] [2015.5] Tasks can be in queued state instead of running
2015-11-03 21:14:24 -07:00
Nitin Madhok
804a0a6537
Tasks can be in queued state instead of running. Fixes #28511
2015-11-03 18:37:34 -05:00
Justin Findlay
63bd3e52b3
Merge pull request #28531 from rallytime/fix-24585
...
Add versionadded directives to virtualenv_mod state/module
2015-11-03 14:34:49 -07:00
Mike Place
ea3bf972c4
Merge pull request #28508 from twangboy/fix_unit_tests_windows
...
Fixed windows tests
2015-11-03 12:31:12 -07:00
Mike Place
73c5735fc1
Merge pull request #28525 from rallytime/route53_spacing
...
Fix spacing in doc examples for boto_route53 state and module
2015-11-03 12:30:24 -07:00
rallytime
bc577b2531
Add versionadded directives to virtualenv_mod state/module
...
Fixes #24585
2015-11-03 11:22:51 -07:00
twangboy
0da6ff7c50
Fixed some logic
2015-11-03 10:09:49 -07:00
rallytime
6ab2ce615c
Fix spacing in doc examples for boto_route53 state and module
2015-11-03 08:50:41 -07:00
Mike Place
2d7f934f67
Merge pull request #28517 from rallytime/fix-28243
...
Add state_auto_order defaults to True note to ordering docs
2015-11-03 07:04:40 -07:00
rallytime
be8f650901
Punctuation.
2015-11-02 19:30:58 -06:00
rallytime
fd846822c1
Add state_auto_order defaults to True note to ordering docs
...
Fixes #28243
2015-11-02 19:29:32 -06:00
Colton Myers
63ce8f78d5
Merge pull request #28512 from basepi/merge-forward-2015.5
...
[2015.5] Merge forward from 2014.7 to 2015.5
2015-11-02 17:38:08 -07:00
Colton Myers
61c382133a
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5
...
Conflicts:
salt/cli/__init__.py
2015-11-02 16:52:09 -07:00
twangboy
cf1e059be5
Fixed windows tests
2015-11-02 16:16:22 -07:00
Colton Myers
4bf56cad3f
Merge pull request #28461 from cachedout/issue_28455
...
Wrap all cache calls in state.sls in correct umask
2015-11-02 10:11:02 -07:00
Mike Place
097838ec0c
Wrap all cache calls in state.sls in correct umask
...
Refs #28455
2015-10-30 15:05:36 -06:00
Justin Findlay
37ceae1e88
Merge pull request #28448 from gwaters/add-redhat-notes
...
added a note to the tutorial for redhat derivatives
2015-10-30 12:49:53 -06:00
Gary Waters
e70990704a
added a note to the tutorial for those that redhat so they can use the state file too.
2015-10-30 09:47:46 -07:00
Mike Place
5ef50d60cd
Merge pull request #28406 from rallytime/bp-28381
...
Back-port #28381 to 2015.5
2015-10-29 13:10:37 -06:00
Mike Place
30d5f7bbae
Merge pull request #28413 from rallytime/bp-28400
...
Back-port #28400 to 2015.5
2015-10-29 12:06:46 -06:00
Mike Place
f3e61db045
Merge pull request #28407 from DSRCompany/issues/24910_token_auth_fix_2014
...
Don't request creds if auth with key.
2015-10-29 10:12:30 -06:00
Krzysztof Pawłowski
ae1921b922
Do not execute _preflight_check if not_installed list is empty in _find_install_targets. Calling with empty list on rhel/centos cause execution of repoquery --whatprovides without pkg list which is memory consumptive task for host and also for red hat satellite server.
2015-10-29 12:08:17 -04:00
Erik Johnson
045d540aff
Merge pull request #28366 from erchn/fix_yumpkg_mod_repo_disabled
...
mark repo not enabled when pkgrepo state passes in disable: True
2015-10-29 09:55:54 -06:00
Dmitry Kuzmenko
b7b5bec309
Don't request creds if auth with key.
2015-10-29 18:32:58 +03:00
Jason Wolfe
e5322d2c44
Add FreeBSD detection for VirtualBox
2015-10-29 10:50:37 -04:00
Mike Place
3923f4a569
Merge pull request #28373 from beverlcl/fix-use_carrier-28372
...
Fixing bug #28372 for use_carrier option on bonding network interfaces.
2015-10-29 08:45:57 -06:00
Chris Beverly
32cffeceb6
Fixing bug #28372 for use_carrier option on bonding network interfaces.
2015-10-28 13:47:31 -07:00
Mike Place
e07e3f257b
Merge pull request #28359 from rallytime/bp-28358
...
Back-port #28358 to 2015.5
2015-10-28 14:43:04 -06:00
Ethan Erchinger
8187a4ce20
re-arrange things a bit to have less overall changes
2015-10-28 20:38:10 +00:00
Ethan Erchinger
f1d570ff18
move todelete above disabled check, add comment
2015-10-28 20:34:37 +00:00
Ethan Erchinger
64feec413f
also remove disabled key from repo_opts
2015-10-28 19:08:32 +00:00
Ethan Erchinger
2f2ebb7bb6
mark repo not enabled when pkgrepo state passes in disable: True
2015-10-28 18:48:06 +00:00
Arthur Lutz
9cacbf582b
docstring typo fix - list returners not runners
2015-10-28 12:40:28 -04:00
Mike Place
282be7ba5a
Merge pull request #28346 from twangboy/fix_installer
...
Fix installer
2015-10-28 08:21:34 -06:00
twangboy
f65e3e5275
Updated documentation to reflect the new parameter
2015-10-27 15:56:53 -06:00
twangboy
a0c5223554
Fixes #27923 and #28000
...
Fixed a bug where the installer wouldn't grab current config if the salt
service was stopped
Added a switch to start the salt service at the end
Switch works with both silent and GUI installs
/start-service=1 will start the service
/start-service=0 will not start the service
Default is to start the service
2015-10-27 15:43:22 -06:00
Colton Myers
7858f04ebc
Merge pull request #28315 from gwaters/update-pillar-doc
...
Adding a working example of setting pillar data on the cli
2015-10-27 09:27:49 -06:00
Gary Waters
b15285c0b4
adding a working example of setting pillar data on the cli
2015-10-26 14:22:38 -07:00
Mike Place
45305ccf29
Merge pull request #28211 from terminalmage/legacy_git_pillar-2015.5
...
Fix for ext_pillar being compiled twice in legacy git_pillar code (2015.5 branch)
2015-10-26 08:14:02 -06:00
Pedro Algarvio
a6cc84c407
Merge pull request #28263 from cachedout/issue_26411-1
...
New channel for event.send
2015-10-26 14:07:06 +00:00
Mike Place
788e1463d8
Merge pull request #28293 from cachedout/fix_28271
...
Minor grammar changes
2015-10-26 06:15:42 -06:00
Mike Place
499ed8519b
Minor grammar changes to #28271
2015-10-26 06:15:19 -06:00
Mike Place
e178af0b90
Merge pull request #28271 from gwaters/update-tutorial-documentation
...
Update tutorial documentation
2015-10-26 06:12:37 -06:00
Justin Findlay
e3eff9b909
Merge pull request #28280 from 0xf10e/patch-1
...
Correct Jinja function load_* to import_*
2015-10-24 22:11:10 -06:00
Erik Johnson
0d6a4ac115
Remove non-functional test
...
This test was written using an incorrect assumption that the
pillar_roots key created during git_pillar execution lives any longer
than the run that compiles the git_pillar data for a given git_pillar.
2015-10-24 17:39:16 -05:00
Florian Ermisch
6d4316b0ac
Correct Jinja function load_* to import_*
...
Fixes #28248 .
Also added a YAML example because really, who wants to write json by hand? ;)
Don't know if this is mentioned in the pillar docs but would be very useful there, too.
2015-10-24 12:13:37 +02:00
Gary Waters
f96d39483d
updated the tutorial with gravyboat's suggestions
2015-10-23 17:09:49 -07:00
Gary Waters
b1f4a2bdf4
i think i changed the wrong header, updated to fix
2015-10-23 15:45:17 -07:00
Gary Waters
846b3aece1
I found you can not run the cp.push commands until after enabling the feature in the conf, so I wanted to update the docs so others who try these commands wont bump into the same issue I had.
2015-10-23 15:34:31 -07:00
Mike Place
3b880a5f07
New channel for event.fire_master
...
Stand up a new channel if using salt-call.
Refs #26411
2015-10-23 15:20:13 -06:00
