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
Thomas S Hatch
e2db624b37
Fix issues with the syndic not resolving the master when the interface is set
2015-04-16 16:57:44 -06:00
salt_build
4d25af8acf
Fixed version not showing in Add/Remove Programs
2015-04-16 22:43:51 +00:00
salt_build
075f82e046
Final edits to the batch files for running salt
2015-04-16 22:08:27 +00:00
Justin Findlay
1fb606ef6b
Merge pull request #22754 from twangboy/fix_bat_again
...
Removed redundant \ and "
2015-04-16 13:50:00 -06:00
twangboy
223c46a38e
Removed redundent \ and "
2015-04-16 18:40:23 +00:00
Nicole Thomas
75348e5113
Merge pull request #22748 from twangboy/fix_bat
...
Changed %cd% to %~dp0
2015-04-16 10:27:31 -06:00
salt_build
2d3d0b1c15
Changed %cd% to %~dp0
2015-04-16 15:07:28 +00:00
Thomas S Hatch
787ec88373
Merge pull request #22716 from twangboy/list_pkg_fix
...
Removed list_pkgs caching
2015-04-15 22:51:02 -06:00
Shane Lee
e1ee7db991
Update win_pkg.py
...
Fixed some lint
2015-04-15 22:10:02 -06:00
salt_build
2ce35d2621
Removed list_pkgs caching
2015-04-15 19:47:30 +00:00
Justin Findlay
3a5a60b5a7
Merge pull request #22688 from msteed/issue-22676
...
Add missing command line options to man pages
2015-04-14 23:17:47 -06:00
Thomas S Hatch
fb31ab4dd5
Merge pull request #22693 from dmyerscough/fix-keyerror-in-salt-cloud
...
Fixing key error
2015-04-14 22:06:45 -06:00
Damian Myerscough
f35c3bd8b6
Fixing key error
2015-04-14 19:53:16 -07:00
Michael Steed
70f1ca9ea5
Add missing command line options to man pages
...
Refs #22676
2015-04-14 17:32:56 -06:00
Nicole Thomas
23a9d77fd2
Merge pull request #22674 from jacobhammons/2014.7
...
Regenerated salt-call and salt.7 man pages
2015-04-14 15:42:44 -06:00
Jacob Hammons
6e416fc300
Regenerated salt-call and salt.7 man pages Refs #22239
2015-04-14 13:56:31 -06:00
Nicole Thomas
c0d1bdd60b
Merge pull request #22666 from msteed/issue_22239
...
Update salt-call manpage to match cli help text
2015-04-14 13:24:03 -06:00
Nicole Thomas
edeec678d4
Merge pull request #22623 from thatch45/merge_22115
...
merge 22115 in correct branch
2015-04-14 12:47:20 -06:00
Michael Steed
5efb284c22
Update salt-call manpage to match cli help text
...
refs #22239
2015-04-14 11:52:55 -06:00
Justin Findlay
795c01d362
Merge pull request #22656 from jfindlay/bp-22624
...
backport #22624 to 2014.7
2015-04-14 10:50:33 -06:00
Justin Findlay
9a2aca4671
Merge pull request #22643 from TimJones/fix-pkgrepo-ppa-missing-add-apt-repository
...
Fix aptpkg.mod_repo returning OK even if apt-add-repository fails.
2015-04-14 09:30:25 -06:00
Artur Kaszuba
e4d8478eae
Remove blank line
2015-04-14 09:01:44 -06:00
Artur Kaszuba
0a5c345889
Fix for high cpu usage by salt-ssh
2015-04-14 08:48:13 -06:00
Justin Findlay
a219be7c07
Merge pull request #22625 from rallytime/bp-22565
...
Backport #22565 to 2014.7
2015-04-14 08:13:26 -06:00
Tim Jones
5099621512
Fix aptpkg.mod_repo returning OK even if apt-add-repository fails.
...
Fixes #22638 . aptpkg.mod_repo raises an error if apt-add-repository
returns with a non-zero exit code.
2015-04-14 12:48:53 +02:00
Artur Kaszuba
ecc14deff8
Increase frequency of ssh terminal output checking
2015-04-13 16:03:35 -06:00
Thomas S Hatch
05a9f47356
merge 22115 in correct branch
2015-04-13 15:50:37 -06:00
Thomas S Hatch
670c07b6fd
Merge pull request #22621 from rallytime/release_note_change
...
Add note about missing state internal keyword arguments to release notes
2015-04-13 15:32:15 -06:00
rallytime
fb03af37d3
Add note about missing state internal keyword arguments to release notes
2015-04-13 15:29:55 -06:00
Thomas S Hatch
e24ffa05d9
Merge pull request #22610 from rallytime/batch-bug_note
...
Add batch matching bug note to known issues in 2014.7.4 release notes
2015-04-13 15:25:12 -06:00
