Thomas S Hatch
6424984ee3
Merge pull request #21974 from tjstansell/fix-21952-2014.7
...
fixes #21952 - only read ssh host_key header for legacy binary format
2015-03-25 08:41:21 -06:00
Thomas S Hatch
7e36c57044
Merge pull request #21972 from tjstansell/fix-21971
...
fix #21971 - ssh_host_key.pub should return as key.pub not key.pub.pub
2015-03-25 08:40:45 -06:00
Todd Stansell
383e21bc7b
fix #21971 - ssh_host_key.pub should return as key.pub not key.pub.pub
2015-03-24 23:46:56 -07:00
Todd Stansell
4aaacfde40
fixes #21952 - only read ssh host_key header for legacy binary format of private key
2015-03-24 23:20:47 -07:00
jfindlay
b409209b47
Merge pull request #21968 from ryanwohara/2014.7
...
Verifying the key has a value before using it.
2015-03-24 22:03:08 -06:00
jfindlay
dd37f431fb
Merge pull request #21962 from rallytime/apply_nested_outputter_fix_to_2014.7
...
Apply nested outputter optimization fix to 2014.7
2015-03-24 22:02:11 -06:00
Ryan W. O'Hara
cbb09b0a14
Verifying the key has a value before using it.
2015-03-24 22:44:05 -04:00
Nicole Thomas
d768fe8ec4
Merge pull request #21965 from basepi/salt-ssh.file.recurse.21922
...
[2014.7] Catch msgpack error in file.recurse in salt-ssh
2015-03-24 19:27:47 -06:00
Nicole Thomas
cda629d531
Merge pull request #21963 from cachedout/2014_7_3_changes
...
Release note changes
2015-03-24 17:32:24 -06:00
rallytime
72f1fff7a3
Remove unused import
2015-03-24 17:26:50 -06:00
Nicole Thomas
39d2b5bf54
Merge pull request #21944 from cachedout/catch_pillar_refresh_error
...
Prevent multi-master from dying with pillar refresh error
2015-03-24 17:19:58 -06:00
Colton Myers
3d8b31f7c4
Catch msgpack error in file.recurse
2015-03-24 17:02:19 -06:00
Mike Place
2639f4b566
Release note changes
2015-03-24 17:02:18 -06:00
rallytime
15680cdbb2
Apply nested outputter optimization fix to 2014.7
2015-03-24 16:51:00 -06:00
Thomas S Hatch
afcf1d7b27
Merge pull request #21955 from rallytime/update_master_conf_doc
...
Add default for pillar_source_merging_strategy in conf/master file
2015-03-24 16:45:40 -06:00
Mike Place
e68306edb1
Remove pass
2015-03-24 15:57:48 -06:00
Mike Place
16fbfa3bd5
Merge pull request #21957 from cachedout/2014_7_3_release_notes
...
2014.7.3 release notes
2015-03-24 15:50:24 -06:00
Mike Place
e6d70629df
2014.7.3 release notes
2015-03-24 15:48:05 -06:00
rallytime
73a0df18a8
There are 4 values, not 3.
2015-03-24 14:57:29 -06:00
rallytime
c98118eb55
Update pillar_source_merging_strategy config doc spacing
...
to match accross all config values
2015-03-24 14:56:09 -06:00
rallytime
609dcdbac1
Add default for pillar_source_merging_strategy in conf/master file
...
Fixes #21511
2015-03-24 14:53:18 -06:00
jfindlay
4eb759f775
Merge pull request #21946 from cro/defaults_clarification
...
Clarify how defaults are indicated in the config files.
2015-03-24 14:16:19 -06:00
C. R. Oldham
a35f38a71e
Clarify how defaults are indicated in the config files.
2015-03-24 12:27:51 -06:00
Nicole Thomas
dfb794bdc7
Merge pull request #21941 from thatch45/load_base_name
...
Add a seperate loader base name path to multimaster
2015-03-24 12:25:02 -06:00
Mike Place
52c548960d
Revert auth attempt
2015-03-24 12:22:16 -06:00
Mike Place
9b45bc2a26
Re-auth after pillar fail
2015-03-24 12:10:07 -06:00
C. R. Oldham
5dbb0d433d
Clarify how defaults are indicated in the config files.
2015-03-24 12:10:01 -06:00
Mike Place
4fc1abd161
Duh.
2015-03-24 11:56:57 -06:00
Mike Place
5d0f2bcfb2
Prevent multi-master from dying with pillar refresh error
2015-03-24 11:42:32 -06:00
Thomas S Hatch
78fc0f8799
Add a seperate loader base name path to multimaster
2015-03-24 10:12:01 -06:00
Thomas S Hatch
278d293321
Merge pull request #21926 from jfindlay/fix_net
...
fix network.iface module related stack traces
2015-03-23 21:37:53 -06:00
Justin Findlay
a16039c5f1
fix network.iface module related stack traces
2015-03-23 20:57:51 -06:00
Thomas S Hatch
d3e14e51b0
Merge pull request #21921 from jfindlay/net_arp
...
config gate net.arp on presence of arp
2015-03-23 19:25:54 -06:00
Thomas S Hatch
fadf44c202
Merge pull request #21811 from jacksontj/2014.7
...
Re-work timeouts in saltnado
2015-03-23 19:22:22 -06:00
jfindlay
334a7b8b4f
Merge pull request #21918 from rallytime/bp-21885
...
Backport #21885 to 2014.7
2015-03-23 19:19:07 -06:00
Justin Findlay
958bf0979c
config gate net.arp on presence of arp
2015-03-23 17:02:27 -06:00
Matt Willsher
78747b5d87
Remove check for physical virt type for KVM
...
KVM can run in VMs when VT-x is passed through the VM, as can be done on VMWare Fusion, and Workstation, perhaps even KVM itself.
2015-03-23 16:00:25 -06:00
Nicole Thomas
e07220d529
Merge pull request #21901 from cachedout/deepcopy_opts
...
Deep copy opts
2015-03-23 15:56:03 -06:00
Thomas Jackson
fbaf02c596
Have per-job minions_remaining
2015-03-23 12:14:27 -07:00
Mike Place
3a5f36dc32
Deep copy opts
...
Fixes bug with highstate routing file client asymetrically
2015-03-23 11:51:57 -06:00
jfindlay
ba083a657d
Merge pull request #21872 from borgstrom/issue-21796-2014.7
...
Remove _locals from the final exec call in pyobjects (2014.7)
2015-03-21 11:04:30 -06:00
Evan Borgstrom
3223a15f83
This fixes #21796
...
From the Python docs on the exec statement:
> Remember that at module level, globals and locals are the same dictionary.
> If two separate objects are given as globals and locals, the code will be
> executed as if it were embedded in a class definition.
We were providing a specific object for locals and in the specific case
reported in #21796 this caused a very strange name error when used in a
specific way. By removing the explicit locals dictionary and just having the
globals dictionary be shared fixes the issue, and we weren't using the
specific locals anyway.
2015-03-21 07:58:14 -07:00
Shane Lee
af01dc7ca5
Merge pull request #21861 from twangboy/build
...
Final (hopefully) improvements to the new build structure
2015-03-20 13:19:32 -07:00
Shane Lee
febef7eb78
Update salt-cp.bat
2015-03-20 14:18:57 -06:00
twangboy
d5da92e58c
Added batchfiles to mimick the behavior of the exe's
2015-03-20 14:12:48 -06:00
twangboy
81025d8388
Fixed version parameter
2015-03-20 13:50:56 -06:00
twangboy
db64bef89c
Updated BuildSalt and Salt-Minion-Setup.nsi
...
- Fixed problem with missing folders and files
- Fixed problem with detecting cpu architecture
2015-03-20 13:48:08 -06:00
Shane Lee
86037bbc4c
Merge pull request #21854 from jfindlay/bp-21791
...
backport #21791 to 2014.7
2015-03-20 12:44:24 -07:00
Thomas S Hatch
9da5b3342b
Merge pull request #21857 from jfindlay/bp-21844
...
backport #21844 to 2014.7
2015-03-20 13:22:59 -06:00
twangboy
fbec10071a
Edited Salt-Minion-Setup.nsi, Added BuildSalt.bat
2015-03-20 13:19:44 -06:00
