Thomas S Hatch
258ef59cbe
Merge pull request #22804 from rallytime/bp-22765
...
Backport #22765 to 2015.2
2015-04-17 15:07:05 -06:00
twangboy
adc421acdd
Fixed some formatting issues
2015-04-17 15:03:47 -06:00
Justin Findlay
1c288dc146
Merge pull request #22505 from jayeshka/sysmod-unit-test
...
adding sysmod unit test case.
2015-04-17 15:03:39 -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
Colton Myers
e25ac2da82
Dict, not list
2015-04-17 14:21:20 -06:00
Colton Myers
e17523afb1
It's already been converted to a list
2015-04-17 14:20:28 -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
Colton Myers
6a232d1b49
Add list targeting to salt-ssh flat roster
...
Fixes #22703
2015-04-17 14:00:21 -06:00
Dmitri Muntean
085ee287d2
Requests to AWS instance metadata should never be proxied
...
Enforce usage of no proxies for requests that query instance metadata
service in AWS. Trying to access this URI via proxy always returns 404.
This caters for the case when proxy settings are picked up from environment,
but NO_PROXY is not correctly set.
2015-04-17 13:45:55 -06:00
rallytime
ce88b6ad41
Allow map file to work with softlayer
...
Refs #17144
2015-04-17 13:33:22 -06:00
Nicole Thomas
3049183f07
Merge pull request #22775 from jayeshka/alternatives-states-unit-test
...
adding states/alternatives unit test case
2015-04-17 13:18:30 -06:00
Thomas S Hatch
ba8c70100a
Merge pull request #22802 from rallytime/bp-22799
...
Backport #22799 to 2015.2
2015-04-17 13:17:29 -06:00
Nitin Madhok
90fa6dede7
Fixes #22792
2015-04-17 13:16:13 -06:00
Justin Findlay
977edf1755
Merge pull request #22794 from basepi/merge-forward-2015.2
...
[2015.2] Merge forward from 2014.7 to 2015.2
2015-04-17 12:49:52 -06:00
Justin Findlay
81a28af3bd
Merge pull request #22786 from rallytime/bp-21072
...
Backport #21072 to 2015.2
2015-04-17 12:44:26 -06:00
Erik Johnson
98885f71d6
Add information about libssh2 requirement for pygit2 ssh auth
2015-04-17 13:24:14 -05:00
Nicole Thomas
4d396e5e94
Merge pull request #22777 from jayeshka/apache_module-states-unit-test
...
adding states/apache_module unit test case
2015-04-17 12:08:01 -06: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
Colton Myers
929b7baaf3
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
2015-04-17 11:38:54 -06:00
FELD Boris
e436c37574
Add support for mongod indexes in mongo_future_return
2015-04-17 09:13:47 -06:00
Thomas S Hatch
921a0e9da7
Merge pull request #22778 from rahulhan/pkg_resource_unit_test
...
Adding pkg_resouce.py unit tests
2015-04-17 08:43:04 -06:00
Thomas S Hatch
02a4c41ae1
Merge pull request #22769 from mgwilliams/lithium-utils-compat
...
add utils/compat.py
2015-04-17 08:42:21 -06:00
Thomas S Hatch
134d117eef
Merge pull request #22767 from mgwilliams/lithium-loader
...
loader: add missing import
2015-04-17 08:41:33 -06:00
Rahul Handay
33da15b07b
Adding pkg_resouce.py unit tests
2015-04-17 17:52:13 +05:30
Jayesh Kariya
f5bb21cd3e
adding states/apache_module unit test case
2015-04-17 17:28:54 +05:30
Jayesh Kariya
283899e939
adding states/alternatives unit test case
2015-04-17 15:26:36 +05:30
Jayesh Kariya
5905b03ed8
resolved errors.
2015-04-17 12:34:26 +05:30
Matthew Williams
8db0ccf529
add utils/compat.py
2015-04-17 04:58:30 +00:00
Matthew Williams
53b0f0c93f
loader: add missing import
2015-04-17 04:34:40 +00: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
Nicole Thomas
d14710acce
Merge pull request #22756 from jfindlay/fix_saltmod
...
fix saltmod.function unit test
2015-04-16 16:01:11 -06:00
Justin Findlay
cf94017d88
fix saltmod.function unit test
2015-04-16 14:41:46 -06: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
