Nicole Thomas
d02ba6e3aa
Spelling and typos.
2014-02-11 09:15:57 -07:00
Pedro Algarvio
68b1af1f37
Merge pull request #10328 from mbarrien/archive-env
...
Use environment for archive.extracted. Fixes #10324 .
2014-02-11 13:15:32 +00:00
zheng1
170a475232
add support to config azure management_host
...
Because china azure management_host isn't 'management.core.windows.net'.
2014-02-11 20:35:58 +08:00
Michal Bicz
6ad4415ac1
blockdev state, module and test
2014-02-11 00:11:29 -08:00
halfss
14fb688054
bug: syndic does not return in 1 seconds
...
if syndic not return in 1 seconds after master's minion returned, the raw will be None, so the syndic's minions return could not be display
2014-02-11 15:12:38 +08:00
Damian Myerscough
a30a9ddf43
Unhandled exception in salt-run #9750
2014-02-10 22:36:33 -08:00
A.J. Welch
7cc894e194
Ensure master_port
in minion config matches ret_port
in master config if running a dev version of salt on non-default ports.
2014-02-11 05:10:26 +00:00
Thomas S Hatch
e199be25f4
finish initial salt-key backend for raet communication
2014-02-10 21:00:35 -07:00
pengyao
48a6d4ecba
fixed linux nic name match
...
linux network interface name can have hyphen strings
2014-02-11 11:03:16 +08:00
Michael Barrientos
fceee539c5
Use environment for archive.extracted. Fixes #10324 .
2014-02-10 18:43:07 -08:00
Thomas S Hatch
5d6939278b
Merge pull request #10326 from terminalmage/9895
...
Add suse-specific pkg metadata parser
2014-02-10 19:11:52 -07:00
Thomas S Hatch
e0467c253d
Merge pull request #10325 from s0undt3ch/hotfix/revert-reuse-channels
...
revert reuse channels
2014-02-10 19:11:25 -07:00
Erik Johnson
10d9af9742
Add suse-specific pkg metadata parser
...
This fixes binary package name detection on Suse, since Suse doesn't do
pkgname.version for package names.
2014-02-10 18:48:12 -06:00
Thomas S Hatch
724a409610
Start work on raet key management
2014-02-10 17:45:21 -07:00
Pedro Algarvio
e89fff84ed
Revert "Reuse channels"
...
This reverts commit 2c0a878a06
.
2014-02-10 23:27:40 +00:00
Pedro Algarvio
5a92decfd9
Revert "Update comment"
...
This reverts commit 22df6a69b3
.
2014-02-10 23:27:31 +00:00
Thomas S Hatch
95ddb4eeae
Merge pull request #10323 from rallytime/dig_test
...
Dig tests
2014-02-10 15:44:47 -07:00
Mike Place
c99449c0f6
Remove whitespace
2014-02-10 15:43:57 -07:00
Mike Place
6259f55a4c
Dig tests
2014-02-10 15:38:14 -07:00
Seth House
9a702c334c
Change the top <h1> wording on our index page
...
This is an experimental change to poke at issue #8351 .
2014-02-10 15:23:47 -07:00
Thomas S Hatch
a75a41085e
Don't need range import here, use the key load
2014-02-10 14:41:54 -07:00
Thomas S Hatch
07ac7f058b
Process inbloud udp data
...
This is very simple, if the message is intended for another
process send it to the socket for handling, otherwise pass
it to the sketter locl frame to handle the data.
All undeadable data is dropped
2014-02-10 14:41:54 -07:00
Thomas S Hatch
fbe7ba6be5
Merge pull request #10320 from techhat/softlayer
...
Rename softlayer-hw to softlayer_hw
2014-02-10 14:40:12 -07:00
Joseph Hall
07af52c955
Rename softlayer-hw to softlayer_hw
2014-02-10 13:34:11 -07:00
Thomas S Hatch
17edf0b1a7
Merge pull request #10288 from s0undt3ch/hotfix/lint
...
Lint Fixes
2014-02-10 12:22:09 -07:00
Thomas S Hatch
7989d7da8c
Merge pull request #10314 from muffl0n/develop
...
Remove first three lines if starting with "DO NOT EDIT THIS FILE"
2014-02-10 12:20:47 -07:00
Thomas S Hatch
24acb29712
Merge pull request #10263 from tweakster/develop
...
Allow lxc module to work on both Ubuntu and Redhat
2014-02-10 12:17:57 -07:00
Thomas S Hatch
646f433c6b
Merge pull request #10311 from terminalmage/gitfs-dulwich
...
Add dulwich support to gitfs backend
2014-02-10 12:10:53 -07:00
Thomas S Hatch
3b045d7719
Merge pull request #10319 from plastikos/issue-10318
...
Do not fail if the system does not support IPv6
2014-02-10 12:10:20 -07:00
Thomas S Hatch
010d4231f8
Merge pull request #10313 from s0undt3ch/hotfix/minion-hang-on-join
...
Stop the Jenkins aborted buidls
2014-02-10 12:09:38 -07:00
Thayne Harbaugh
08ed0f0e1e
Do not fail if the system does not support IPv6
...
Fixes : #10318
2014-02-10 11:01:34 -07:00
Colton Myers
d266d46699
Merge pull request #10316 from techhat/gce
...
Removing ex_persistent_disk from GCE, as it was only briefly supported...
2014-02-10 10:18:54 -07:00
Joseph Hall
50e388556c
Removing ex_persistent_disk from GCE, as it was only briefly supported by libcloud
2014-02-10 10:15:39 -07:00
Erik Johnson
365338f02c
Fix incorrectly-named variable
2014-02-10 11:06:24 -06:00
Thomas S Hatch
ee61a2948e
Merge pull request #10315 from drj11/patch-1
...
Update file.py
2014-02-10 09:39:25 -07:00
Thomas S Hatch
9276d469ae
Merge pull request #10308 from gtmanfred/develop
...
[salt] add cp.push_dir
2014-02-10 09:33:11 -07:00
Erik Johnson
7e8d5a85c6
Add notes about dulwich support to docstring
2014-02-10 10:32:54 -06:00
Erik Johnson
a047396914
Add dulwich support to gitfs backend
2014-02-10 10:32:33 -06:00
Thomas S Hatch
466f779479
Merge pull request #10305 from halfss/patch-2
...
exactly match minion in list
2014-02-10 09:30:53 -07:00
Thomas S Hatch
00f231e7d8
Merge pull request #10298 from jacksontj/channelreuse
...
Reuse channels
2014-02-10 09:27:07 -07:00
Thomas S Hatch
22184e975b
Merge pull request #10297 from jacksontj/develop
...
Reading through found typo and a redundant opts set
2014-02-10 09:26:03 -07:00
Thomas S Hatch
1f9144ff5e
Merge pull request #10294 from terminalmage/quickfix
...
Prefer GitPython if gitfs_provider not specified
2014-02-10 09:25:23 -07:00
Thomas S Hatch
aca44abf40
Merge pull request #10289 from terminalmage/hgfs-rewrite
...
Make hgfs awesome
2014-02-10 09:24:53 -07:00
muffl0n
4f9ee66b49
Corrected errors reported by Jenkins
2014-02-10 17:23:40 +01:00
Thomas S Hatch
cfc825380e
Merge pull request #10276 from UtahDave/fix_msgpack
...
read and write binary when serializing with msgpack
2014-02-10 09:20:55 -07:00
David Jones
ca6a9259c5
Update file.py
...
"target" is an unfortunate choice of word here.
2014-02-10 16:04:24 +00:00
Pedro Algarvio
362e162496
Remove un-necessary code
2014-02-10 15:10:19 +00:00
muffl0n
3e231304a5
Remove first three lines if starting with "DO NOT EDIT THIS FILE"
...
Patch for #10312
2014-02-10 15:35:14 +01:00
Pedro Algarvio
ec5614bd08
Remove the vim jedi output from the code
2014-02-10 13:28:28 +00:00
Pedro Algarvio
3cffd0e2b8
Remove extra empty line
2014-02-10 13:14:24 +00:00