Hung Nguyen Viet
326cae6dbc
add basic usage doc for salt-cloud
2014-07-10 18:06:43 +07:00
Hung Nguyen Viet
6fa10009c0
add document for installing salt-cloud on Ubuntu
...
as saying that salt cloud is merged to Salt may cause confusing
make user thinks no need to install salt-cloud pkg
2014-07-10 13:01:06 +07:00
Hung Nguyen Viet
fef3b93bec
rewrite some sentences
2014-07-10 11:28:18 +07:00
Hung Nguyen Viet
81d74c1080
avoid confusing with salt-cloud
2014-07-10 11:15:17 +07:00
Thomas S Hatch
779aa72367
Merge pull request #14070 from nshalman/requirements
...
SmartOS esky build: requirements files
2014-07-09 21:23:23 -06:00
Thomas S Hatch
e3a98c1c21
Merge pull request #14082 from whiteinge/full-cors
...
Added support for the full CORS preflight request
2014-07-09 21:21:19 -06:00
Thomas S Hatch
5008d8d750
Merge pull request #14077 from jacksontj/pubfilter
...
Change the defaults to be backwards compatible (fix #13285 )
2014-07-09 21:20:27 -06:00
Thomas S Hatch
ca2b6ac636
Merge pull request #14068 from nmadhok/fix-file-makedirs-function
...
Adding a trailing slash after path if not present when using salt.modules.file.makedirs
2014-07-09 21:19:38 -06:00
Thomas S Hatch
84c5bff537
Merge pull request #14067 from garethgreenaway/network_connect
...
Adding a function to test connections to UDP and TCP ports from minion.
2014-07-09 21:18:34 -06:00
Seth House
d1554a168e
Added support for the full CORS preflight request
2014-07-09 19:41:09 -07:00
Joseph Hall
94a2d57dd8
Merge pull request #14078 from s0undt3ch/hotfix/lint
...
Lint Fixes
2014-07-09 17:41:39 -06:00
Pedro Algarvio
3b3be82014
Remove duplicate method
2014-07-10 00:31:14 +01:00
Pedro Algarvio
e02be6c8d2
White space lint fixes
2014-07-10 00:30:49 +01:00
Pedro Algarvio
04f0052100
Not renaming, so, return True.
2014-07-10 00:25:56 +01:00
Pedro Algarvio
21522a9824
White space lint fixes. Join imports.
2014-07-10 00:25:13 +01:00
Pedro Algarvio
9afe98614f
White space lint fixes
2014-07-10 00:23:54 +01:00
Pedro Algarvio
29fae98470
Merge pull request #14072 from terminalmage/refine-gitfs-tests
...
Refine gitfs tests
2014-07-10 00:02:28 +01:00
Thomas Jackson
23f77ce363
Change the defaults to be backwards compatible ( fix #13285 )
2014-07-09 16:01:43 -07:00
C. R. Oldham
a814de3e43
Merge pull request #14076 from cro/macportsfile
...
Portfile and .plist files for MacPorts
2014-07-09 16:49:06 -06:00
C. R. Oldham
46fdc9b5dd
Portfile and .plist files for MacPorts
2014-07-09 16:46:02 -06:00
Gareth J. Greenaway
f5071774bb
move arguments into kwargs. add ability to force family to be either ipv4 or ipv6, otherwise if a host is specified then we leave it up to the resolver.
2014-07-09 15:27:46 -07:00
Thomas S Hatch
02b2acdbc0
Tom can't spell very well, new news
2014-07-09 16:24:40 -06:00
C. R. Oldham
5cac9152c9
merge commit
2014-07-09 16:19:14 -06:00
C. R. Oldham
fb0bc9a044
Merge pull request #14073 from cro/master_tops_docs
...
Master tops docs
2014-07-09 16:17:44 -06:00
Colton Myers
eea5e357fd
Add 2014.1.7 release notes
2014-07-09 16:12:06 -06:00
C. R. Oldham
426e958296
merge commit
2014-07-09 16:10:44 -06:00
Colton Myers
3ec4d92576
Add 2014.1.7 release notes
2014-07-09 16:08:25 -06:00
Erik Johnson
1fd16fa434
Refine gitfs tests
...
This adds a tearDown to ensure a clean copy of the repo for each test.
In addition, it removes the dependency on lexicographical order by
running a find_file() inside the two tests which require it in order to
ensure that the file exists in the gitfs cache.
2014-07-09 16:06:36 -06:00
Gareth J. Greenaway
04116fb086
minor fix, if protocol is not specified then default to TCP but ensure proto variable is set to tcp for return data.
2014-07-09 15:04:23 -07:00
Thomas S Hatch
de5ac75c7f
pass int he sock_dir, like a boss
2014-07-09 16:03:46 -06:00
C. R. Oldham
6089e410b8
pre-fix lint error
2014-07-09 16:03:22 -06:00
Nahum Shalman
7fbe259eea
SmartOS esky build: requirements files
...
Mimicking the breakout of requirements files in the main project,
this allows me to keep a file of extra requirements that get put in the
esky (e.g. halite) while only needing to point the build process at
either the zeromq or raet requirements file.
2014-07-09 17:49:46 -04:00
Nitin Madhok
c14de24e84
Fixing the order
2014-07-09 17:40:51 -04:00
Nitin Madhok
7bbd9ade1d
Fixes the problem
2014-07-09 17:14:59 -04:00
Gareth J. Greenaway
ba765856e1
Adding a function to test connections to UDP and TCP ports from minion.
2014-07-09 14:06:01 -07:00
Colton Myers
73f09fccc4
Merge pull request #14066 from basepi/2014.1.7releasenotes
...
Add 2014.1.7 release notes
2014-07-09 14:56:33 -06:00
Colton Myers
7303055fe4
Add 2014.1.7 release notes
2014-07-09 14:55:57 -06:00
C. R. Oldham
b12ee150e3
Merge commit
2014-07-09 14:38:53 -06:00
C. R. Oldham
1494477b09
Fix stray if statement
2014-07-09 14:37:59 -06:00
C. R. Oldham
6b52ca55a3
Restore master_tops functionality and add more documentation.
2014-07-09 14:37:59 -06:00
C. R. Oldham
97bca82184
Cherry pick master_tops restore
2014-07-09 14:37:59 -06:00
C. R. Oldham
b89a4c64e1
merge commit
2014-07-09 14:29:18 -06:00
Thomas S Hatch
1c062a7e18
Merge pull request #13285 from jacksontj/pubfilter
...
More granular master job targeting
2014-07-09 12:48:27 -06:00
Thomas S Hatch
ccb4f1e1e8
Merge pull request #14059 from rallytime/schedule_tests
...
One more unit test for utils.schedule
2014-07-09 12:45:05 -06:00
Thomas S Hatch
9e0b920cc8
Merge branch 'nmadhok-restructure-dockerio-module-docs' into develop
2014-07-09 12:44:10 -06:00
Thomas S Hatch
218ca91bef
Merge branch 'restructure-dockerio-module-docs' of https://github.com/nmadhok/salt into nmadhok-restructure-dockerio-module-docs
...
Conflicts:
salt/daemons/flo/core.py
2014-07-09 12:43:55 -06:00
Thomas S Hatch
23abbb99b3
Merge pull request #14032 from ihrwein/add-partial-psutil-2.0-compatibility-to-ps-module
...
ps: add partial psutil 2.0 compatibility
2014-07-09 12:39:35 -06:00
Thomas S Hatch
25e7b8f218
Merge pull request #14060 from jacksontj/develop
...
Update to the salt @ scale doc
2014-07-09 12:36:36 -06:00
Thomas Jackson
71f97b9ee7
Update to the salt @ scale doc
2014-07-09 11:06:24 -07:00
rallytime
7cd31ae480
Fix typo
2014-07-09 12:03:09 -06:00
