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
Justin Findlay
9211e36564
Merge pull request #22877 from s0undt3ch/hotfix/clean-docs-fix
...
Don't fail on `make clean` just because the directory does not exist
2015-04-20 20:40:47 -06:00
Justin Findlay
5bdbd08bbd
Merge pull request #22873 from thatch45/type_check
...
Type check the version since it will often be numeric
2015-04-20 20:38:11 -06:00
Justin Findlay
ea2fd50660
increase timeout and tries for route53 records
...
Fixes #18720 .
2015-04-20 19:26:24 -06:00
Pedro Algarvio
95d6887949
Don't fail on make clean just because the directory does not exist
2015-04-21 00:46:09 +01:00
Thomas S Hatch
53b8376626
Type check the version since it will often be numeric
2015-04-20 17:27:24 -06:00
Shane Lee
c965b0a035
Merge pull request #22870 from twangboy/fix_installer_again
...
Added ability to send a version with a space in it
2015-04-20 17:18:28 -06:00
rallytime
c88a1ea243
Prevent stacktrace on os.path.exists in hosts module
...
If hfn is None, it will stacktrace in os.path.exists. Change it
to an empty string.
2015-04-20 16:21:24 -06:00
salt_build
3f180cfaae
Added ability to send a version with a space in it
2015-04-20 21:55:57 +00:00
Shane Lee
cb999c7d70
Update pip.py
...
Added a 'r' to account for the backslashes
2015-04-20 14:19:49 -06:00
Justin Findlay
2973eb18bc
Merge pull request #22863 from rallytime/bp-20974
...
Backport #20974 to 2014.7
2015-04-20 13:29:37 -06:00
Johannes Ebke
14913a4cb4
Fix expr_match usage in salt.utils.check_whitelist_blacklist
2015-04-20 12:24:01 -06:00
Thomas S Hatch
c45b92bb4b
Merge pull request #22578 from hvnsweeting/2014-7-fix-compile-pillar
...
gracefully handle when salt-minion cannot decrypt key
2015-04-20 09:24:44 -06:00
Pedro Algarvio
b62df62151
Don't assume package installation order.
...
Additionally pep8 when installed using wheel, reports the version
together with the name.
2015-04-20 14:45:25 +01:00
Étienne BERSAC
31b98e72eb
Initialize state file client after pillar loading
2015-04-20 15:14:05 +02:00
Étienne BERSAC
f6bebb7a31
Use saltenv
2015-04-20 15:14:05 +02:00
Justin Findlay
900c7a510f
Merge pull request #22800 from terminalmage/issue21979
...
Improve error logging for pygit2 SSH-based remotes
2015-04-18 11:18:55 -06:00
Justin Findlay
e99f2fdb28
Merge pull request #22813 from twangboy/win_doc_fix
...
Updated instructions for building salt
2015-04-17 22:10:07 -06:00
Erik Johnson
8f1c0084cd
Clarify that for pygit2, receiving 0 objects means repo is up-to-date
...
This seems to be too confusing to users, so this changes the log message
to say that the repo is up-to-date instead of saying that 0 objects were
received.
2015-04-17 22:11:40 -05:00
Viet Hung Nguyen
f75b24ad68
gracefully handle when salt-minion cannot decrypt key
...
or salt-minion will die. Returns None to deligate
this job to compile_pillar function handle it,
as it is the only caller of this function for now
2015-04-18 09:52:36 +07:00
Colton Myers
fe1de89ad7
Merge pull request #22810 from basepi/salt-ssh.more.msgpack.gating
...
[2014.7] More msgpack gating for salt-ssh
2015-04-17 16:28:24 -06:00
twangboy
3cc5c970ad
Added documentation regarding pip in windows
2015-04-17 16:23:32 -06:00
twangboy
adc421acdd
Fixed some formatting issues
2015-04-17 15:03:47 -06:00
twangboy
8901b3b5a6
Updated instructions for building salt
2015-04-17 14:41:46 -06:00
Joseph Hall
11df71e16d
Merge pull request #22803 from rallytime/fix-17144
...
Allow map file to work with softlayer
2015-04-17 14:34:42 -06:00
Colton Myers
d4da8e66a4
Gate msgpack in salt/modules/saltutil.py
2015-04-17 14:33:19 -06:00
Thomas S Hatch
cd43a95212
Merge pull request #22807 from rallytime/windows_docs_update
...
Add 2014.7.5 links to windows installation docs
2015-04-17 14:32:13 -06:00
Colton Myers
02303b22ce
Gate msgpack in salt/modules/data.py
2015-04-17 14:32:02 -06:00
Colton Myers
d7e8741f02
Gate salt.states.file.py msgpack
...
Fixes #22708
2015-04-17 14:29:23 -06:00
rallytime
5931a582d1
Replace all 4s with 5s
2015-04-17 14:15:33 -06:00
rallytime
eadaead755
Add 2014.7.5 links to windows installation docs
2015-04-17 14:13:40 -06:00
rallytime
ce88b6ad41
Allow map file to work with softlayer
...
Refs #17144
2015-04-17 13:33:22 -06:00
Erik Johnson
98885f71d6
Add information about libssh2 requirement for pygit2 ssh auth
2015-04-17 13:24:14 -05:00
Thomas S Hatch
0b295e2c87
Merge pull request #22795 from rallytime/release_notes
...
Added release note for 2014.7.5 release
2015-04-17 12:05:36 -06:00
Erik Johnson
09468d2607
Fix incorrect log message
...
In pygit2, the ssh transport doesn't accept password auth.
2015-04-17 13:04:56 -05:00
Erik Johnson
2093bf8d96
Adjust loglevels for gitfs errors
...
The "critical" loglevel should be used for hard failures only.
2015-04-17 13:02:50 -05:00
Erik Johnson
9d394dfe46
Improve error logging for pygit2 SSH-based remotes
...
If libgit2 is compiled without libssh2, an "Unsupported URL protocol"
GitError exception is raised. This commit catches this exception and, if
the credentials are a keypair (which means SSH auth), logs an meaningful
error message that will let the user know that libgit2 was probably not
compiled with libssh2.
2015-04-17 12:49:54 -05:00
rallytime
fde1feed46
Remove extra line
2015-04-17 11:42:14 -06:00
rallytime
b19b95d992
Added release note for 2014.7.5 release
2015-04-17 11:41:07 -06:00
Justin Findlay
3c91459de2
Merge pull request #22759 from twangboy/fix_bat_one_last_time
...
Final edits to the batch files for running salt
2015-04-16 22:31:15 -06:00
Justin Findlay
20d3f2bb83
Merge pull request #22760 from thatch45/syndic_fix
...
Fix issues with the syndic
2015-04-16 22:30:48 -06:00
Justin Findlay
54c45845ab
Merge pull request #22762 from twangboy/fix_installer
...
Fixed version not showing in Add/Remove Programs
2015-04-16 22:29:46 -06:00
