Justin
8486e17ab3
Added retry_dns to minion doc.
2015-04-23 15:33:59 -06:00
Nicole Thomas
27dc877bfd
Merge pull request #22990 from techhat/2014.7
...
Use the proper cloud conf variable
2015-04-23 11:48:07 -06:00
Joseph Hall
d33bcbc2c1
Use the proper cloud conf variable
2015-04-23 10:09:05 -06:00
Justin Findlay
13dff652c6
Merge pull request #22976 from multani/fix/state-output-doc
...
Improve state_output documentation
2015-04-23 06:24:22 -06:00
Jonathan Ballet
19efd419b5
Improve state_output documentation
...
List all the available settings in the documentation and on the command
line.
Also, make the documentation clearer about the different possibilities.
2015-04-23 10:22:11 +02:00
Justin Findlay
89fa18500c
Merge pull request #22955 from terminalmage/dockerio-run-fix
...
Fix regression introduced yesterday in dockerio module
2015-04-22 12:56:39 -06:00
Justin Findlay
46ef227911
Merge pull request #22954 from rallytime/bp-22909
...
Backport #22909 to 2014.7
2015-04-22 12:56:20 -06:00
Erik Johnson
b4472ad1b2
Fix regression introduced yesterday in dockerio module
...
This fixes a problem introduced in 8ddbc20, I left out the double-dash
between the nsenter arguments and the command to run via nsenter.
2015-04-22 12:13:47 -05:00
mguegan
70c1cd3969
Fix compatibility with pkgin > 0.7
...
- Add testing for parsing ability
- Fix broken parser for :
- pkg.list_pkgs
- pkg.search
Sample of bad parsing :
[INFO ] Executing command '/usr/sbin/zfs help || :' in directory '/root'
[INFO ] Executing command '/opt/local/bin/pkgin -v' in directory '/root'
[INFO ] Executing command '/opt/local/bin/pkgin se ^memcached$' in directory
'/root'
local:
----------
memcached-1.4.21;=;High:
performance
2015-04-22 11:13:31 -06:00
Thomas S Hatch
c9ae593461
Merge pull request #22856 from jfindlay/route53_timeout
...
increase timeout and decrease tries for route53 records
2015-04-22 10:47:01 -06:00
Thomas S Hatch
a178d444b8
Merge pull request #22946 from s0undt3ch/2014.7
...
Test with a more recent pip version to avoid a traceback
2015-04-22 10:25:17 -06:00
Mike Place
de339bef0a
Merge pull request #22945 from garethgreenaway/22571_2014_7_schedule_pillar_refresh_seconds_exceptions
...
Fixes to scheduler
2015-04-22 10:25:00 -06:00
Thomas S Hatch
12d2b91d85
Merge pull request #22887 from hvnsweeting/18843-fix-user-present-home
...
fix #18843
2015-04-22 09:47:05 -06:00
Mike Place
b7de7bdf47
Merge pull request #22930 from jfindlay/localegen_bool
...
localemod.gen_locale now always returns a boolean
2015-04-22 09:37:39 -06:00
Mike Place
11bcf14979
Merge pull request #22933 from hvnsweeting/18843-test
...
add test for #18843
2015-04-22 09:27:18 -06:00
Pedro Algarvio
bc87749e2c
Test with a more recent pip version to avoid a traceback
...
```
07:39:05,449 [salt.minion :1178][ERROR ] A command in 'pip.list' had a problem: Traceback (most recent call last):
File "/tmp/salt-tests-tmpdir/6833-pip-upgrade-pip/bin/pip", line 9, in <module>
load_entry_point('pip==1.3.1', 'console_scripts', 'pip')()
File "/tmp/salt-tests-tmpdir/6833-pip-upgrade-pip/lib/python2.6/site-packages/pkg_resources/__init__.py", line 546, in load_entry_point
return get_distribution(dist).load_entry_point(group, name)
File "/tmp/salt-tests-tmpdir/6833-pip-upgrade-pip/lib/python2.6/site-packages/pkg_resources/__init__.py", line 2666, in load_entry_point
return ep.load()
File "/tmp/salt-tests-tmpdir/6833-pip-upgrade-pip/lib/python2.6/site-packages/pkg_resources/__init__.py", line 2339, in load
return self.resolve()
File "/tmp/salt-tests-tmpdir/6833-pip-upgrade-pip/lib/python2.6/site-packages/pkg_resources/__init__.py", line 2345, in resolve
module = __import__(self.module_name, fromlist=['__name__'], level=0)
File "/tmp/salt-tests-tmpdir/6833-pip-upgrade-pip/lib/python2.6/site-packages/pip/__init__.py", line 13, in <module>
from pip.commands import commands, get_similar_commands, get_summaries
File "/tmp/salt-tests-tmpdir/6833-pip-upgrade-pip/lib/python2.6/site-packages/pip/commands/__init__.py", line 6, in <module>
from pip.commands.bundle import BundleCommand
File "/tmp/salt-tests-tmpdir/6833-pip-upgrade-pip/lib/python2.6/site-packages/pip/commands/bundle.py", line 5, in <module>
from pip.commands.install import InstallCommand
File "/tmp/salt-tests-tmpdir/6833-pip-upgrade-pip/lib/python2.6/site-packages/pip/commands/install.py", line 5, in <module>
from pip.req import InstallRequirement, RequirementSet, parse_requirements
File "/tmp/salt-tests-tmpdir/6833-pip-upgrade-pip/lib/python2.6/site-packages/pip/req/__init__.py", line 3, in <module>
from .req_install import InstallRequirement
File "/tmp/salt-tests-tmpdir/6833-pip-upgrade-pip/lib/python2.6/site-packages/pip/req/req_install.py", line 20, in <module>
import pip.wheel
File "/tmp/salt-tests-tmpdir/6833-pip-upgrade-pip/lib/python2.6/site-packages/pip/wheel.py", line 23, in <module>
from pip.exceptions import InvalidWheelFilename, UnsupportedWheel
ImportError: cannot import name InvalidWheelFilename
```
2015-04-22 16:13:58 +01:00
Gareth J. Greenaway
bfa6d25ed8
Fixing a reported issue when using a scheduled job from pillar with splay. _seconds element that acted as a backup of the actual seconds was being removed when pillar was refreshed and causing exceptions. This fix moves some splay related code out of the if else condition so it's checked whether the job is in the job queue or not.
2015-04-22 08:08:36 -07:00
Viet Hung Nguyen
b13db32fde
add test for #18843
2015-04-22 16:21:23 +07:00
Viet Hung Nguyen
7fe7b089fd
run user.chhome once to avoid any side-effect when run it twice
2015-04-22 13:39:09 +07:00
Viet Hung Nguyen
19de9954ee
clarify the usage of home arg
...
it is not always the dir will be managed by salt
2015-04-22 12:46:15 +07:00
Viet Hung Nguyen
d6dc09af64
enhance doc, as usermod on ubuntu 12.04 will not CREATE home
2015-04-22 12:46:15 +07:00
Viet Hung Nguyen
0ce4d7feb6
refactor: force to use boolean
2015-04-22 12:46:15 +07:00
Viet Hung Nguyen
849d19edd7
log debug the creating dir process
2015-04-22 12:46:14 +07:00
Viet Hung Nguyen
c4e95b9f48
fix #18843 : usermod won't create a dir if old home does not exist
...
usermod only MOVE old home to new path. So create home dir by salt.
2015-04-22 12:46:04 +07:00
Justin Findlay
399399f89e
localemod.gen_locale now always returns a boolean
...
Related to #22829 , also fixes #21140 .
2015-04-21 22:31:56 -06:00
Justin Findlay
6890752dd3
Merge pull request #22925 from rallytime/bp-22895
...
Backport #22895 to 2014.7
2015-04-21 20:30:26 -06:00
rallytime
3852d96213
Pylint fix
2015-04-21 19:19:08 -06:00
Alexandre Letourneau
90f7829ad3
Fixed pylint issues
2015-04-21 19:18:48 -06:00
Alexandre Letourneau
5ebf159554
Cleaned up pull request
2015-04-21 19:18:39 -06:00
Alexandre Letourneau
a08ac478f6
pam_tally counter was not reset to 0 after a succesfull login
2015-04-21 19:17:47 -06:00
Nicole Thomas
eca37ebc11
Merge pull request #22914 from cachedout/issue_22790
...
Call proper returner function in jobs.list_jobs
2015-04-21 18:49:01 -06:00
Nicole Thomas
44f3409b01
Merge pull request #22918 from JaseFace/git-pillar-provider-doc-note
...
Add a note to the git_pillar docs stating that GitPython is the only currently supported provider
2015-04-21 18:48:26 -06:00
Jason Wolfe
0aee5c23d4
Add a note to the git_pillar docs stating that GitPython is the only currently supported provider
2015-04-21 15:53:26 -07:00
Nicole Thomas
31c461f573
Merge pull request #22907 from techhat/cloudconfig
...
Properly merge cloud configs to create profiles
2015-04-21 16:02:44 -06:00
Mike Place
d828d6fd58
Call proper returner function in jobs.list_jobs
...
Closes #22790
2015-04-21 15:23:48 -06:00
Thomas S Hatch
f0939754a0
Merge pull request #22894 from 0xf10e/2014.7
...
Fix issue #22782
2015-04-21 12:55:18 -06:00
Thomas S Hatch
c802ba7514
Merge pull request #22902 from rallytime/docker_doc_fix
...
Change state example to use proper kwarg
2015-04-21 12:50:47 -06:00
Joseph Hall
3bf4e66112
Properly merge cloud configs to create profiles
2015-04-21 12:07:44 -06:00
Justin Findlay
81771a7769
Merge pull request #22898 from terminalmage/issue12003
...
dockerio: better error message for native exec driver
2015-04-21 12:02:58 -06:00
Thomas S Hatch
e2ec4ecc55
Merge pull request #22897 from rallytime/fix-22825
...
Add param documentation for file.replace state
2015-04-21 11:31:04 -06:00
rallytime
8f703461b0
Change state example to use proper kwarg
...
docker.run takes cid as a kwarg, not container
2015-04-21 11:16:05 -06:00
Thomas S Hatch
fd53889f0e
Merge pull request #22850 from bersace/fix-pillar-salt-mixed
...
Fix pillar and salt fileserver mixed
2015-04-21 11:04:33 -06:00
Justin Findlay
ba4a786984
add route53 record sync wait, default=False
2015-04-21 10:38:30 -06:00
Erik Johnson
c375309434
dockerio: better error message for native exec driver
...
This provides a more useful error message when using the native
execution driver and nsenter is not available.
2015-04-21 11:23:24 -05:00
rallytime
9c51630002
Add param documentation for file.replace state
...
Fixes #22825
2015-04-21 09:47:31 -06:00
Florian Ermisch
58fa24c7fa
Clarify doc on kwarg 'roles' for user_present().
...
Previously passing the roles in single-key-dicts
worked so the changed behavior should be reflected
in a updated docstring.
2015-04-21 15:50:52 +02:00
Florian Ermisch
f0ae2eb84f
Improve readability by renaming tenant_role
...
The for-loop processing the kwarg roles only
iterates over tenant *names* so naming the
variable "tenant_role" is misleading.
Also explicitly iterating over the passed dict's
keys so we get a useful error message when a list
is passed instead (and makes the code easier to
read).
2015-04-21 15:32:15 +02:00
Justin Findlay
1380fec1b9
Merge pull request #22818 from twangboy/upd_pip_docs
...
Added documentation regarding pip in windows
2015-04-20 21:58:59 -06:00
Justin Findlay
b2bf17f5d5
Merge pull request #22872 from rallytime/fix_hosts_stacktrace
...
Prevent stacktrace on os.path.exists in hosts module
2015-04-20 20:54:39 -06:00
Justin Findlay
03af523de9
Merge pull request #22853 from s0undt3ch/2014.7
...
Don't assume package installation order.
2015-04-20 20:42:41 -06:00
