valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-09 01:36:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
53,678 Commits 24 Branches 182 Tags 341 MiB
8ec82b640d
Commit Graph

53678 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tyler Cipriani
8ec82b640d Update salt vagrant provisioner info 
Also tweaked one piece of confusing verbiage
 2015-05-27 11:13:29 -07:00
Thomas S Hatch
a21dbe4a58 Merge pull request #24152 from dougluce/npm-allow-url-specification 
Allow URL specification of NPM packages
 2015-05-27 10:22:06 -06:00
Thomas S Hatch
5437898a1b Merge pull request #24155 from techhat/returnedjobs 
Let lookup_jid show only missing minions
 2015-05-27 10:21:39 -06:00
Nicole Thomas
987aeb1c17 Merge pull request #24173 from techhat/cookieerr 
Better error and cookie handling
 2015-05-27 09:57:24 -06:00
Nicole Thomas
417f4e7192 Merge pull request #24170 from Precis/fix-pillar-signing-policy 
Signing policy lookup in pillar.
 2015-05-27 09:16:54 -06:00
Joseph Hall
3e22888f15 Linting 2015-05-27 08:52:39 -06:00
Joseph Hall
4c66a9b68b Better error and cookie handling 2015-05-27 08:07:43 -06:00
Matthias Erll
45f93c69a1 Added signing policy lookup in pillar. 2015-05-27 12:46:59 +02:00
Doug Luce
2e36b8a73f Fix indentation. 2015-05-27 02:08:35 -07:00
Nicole Thomas
555cdc95de Merge pull request #24143 from terminalmage/docker-exec 
Drop default use of docker-exec in dockerng
 2015-05-26 17:18:58 -06:00
Joseph Hall
6655831048 Let lookup_jid show only missing minions 2015-05-26 15:25:59 -06:00
Doug Luce
6fe47ea1f4 Allow URL specification of NPM packages 
If an NPM package was specified as a
url (i.e. git://github.com/Unitech/pm2), the state would crash with an
IndexError.  Assume that not every package installed globally is
specified with a URL.

Example failing state:

kvsio:
  npm.installed:
      - name: git+ssh://github.com/dougluce/kvs.io.git
 2015-05-26 13:19:17 -07:00
Erik Johnson
cce85d0cf8 Lint fixes 2015-05-26 12:58:43 -05:00
Erik Johnson
13fa7e6844 Drop default use of docker-exec in dockerng 
See https://groups.google.com/forum/#!topic/salt-users/i6Eq4rf5ml0 for
background on this.
 2015-05-26 12:16:26 -05:00
Nicole Thomas
75a2239f67 Merge pull request #24129 from pengyao/wheel_client_doc 
Wheel client doc
 2015-05-26 09:48:40 -06:00
pengyao
6b88772e28 fixed a typo 2015-05-26 17:57:30 +08:00
pengyao
dff2731249 Add cmd doc for WheelClient 2015-05-26 17:51:34 +08:00
Thomas S Hatch
be701f9eb1 Merge pull request #23937 from jfindlay/depr_file_func 
replace file.contains_regex_multiline with file.search
 2015-05-25 13:47:05 -06:00
Thomas S Hatch
554f3272c5 Merge pull request #24075 from DSRCompany/raet_bufcnt_conf 
Add config options for raet network buffers count
 2015-05-25 13:46:05 -06:00
Thomas S Hatch
f76622ad67 Merge pull request #24076 from garethgreenaway/refactoring_schedule_module 
Refactoring schedule module
 2015-05-25 13:45:50 -06:00
Thomas S Hatch
b7e68a5d8b Merge pull request #24118 from trevor-h/fix-extpillar-mongo 
removed deprecated pymongo usage
 2015-05-25 13:37:17 -06:00
Justin Findlay
bb57880077 Merge pull request #24116 from awdrius/develop 
Fixed typo in chown username (ending dot) that fails the command.
 2015-05-25 12:20:26 -06:00
Trevor Hammond
d8b8f6c2c3 removed deprecated pymongo usage as no longer functional with pymongo > 3.x 2015-05-25 13:45:52 -04:00
Audrius Sadauskas
e33337c209 Fixed typo in chown username (ending dot) that fails the command. 2015-05-25 17:35:52 +01:00
Nicole Thomas
4f080e3577 Merge pull request #24014 from ticosax/dockerng-enforce-env-string 
[dockerng] Enforce environment values to be strings.
 2015-05-25 09:43:58 -06:00
Justin Findlay
81e03e9a1c Merge pull request #24105 from cedwards/beacon_docs 
Updated some beacon-specific documentation formatting
 2015-05-25 06:29:30 -06:00
Joseph Hall
d75dca405d Merge pull request #24104 from pruiz/fix-23364 
Only try to stop a VM if it's not already stopped. (fixes #23364)
 2015-05-25 05:49:49 -06:00
Justin Findlay
2b8175e351 contains_regex_multiline -> search in kmod module 2015-05-24 21:59:13 -06:00
Justin Findlay
422b5f074d contains_regex_multiline -> search in file state 2015-05-24 21:59:13 -06:00
Justin Findlay
c6004f8dca deprecate file.contains_regex_multiline with file.search 2015-05-24 21:59:13 -06:00
Justin Findlay
92a054d0fd enable multiline searching with file.replace 2015-05-24 21:59:13 -06:00
Christer Edwards
4552e6eb7b Updated some beacon-specific documentation formatting 2015-05-24 20:57:06 -06:00
Pablo Ruiz
cd48a95e1d Only try to stop a VM if it's not already stopped. (fixes #23364) 2015-05-25 01:46:06 +02:00
Justin Findlay
7a5612a25e update and expand re flags handling in file mod 2015-05-24 02:10:17 -06:00
Justin Findlay
cf26ab7d12 fix typo in salt.utils.filebuffer 2015-05-24 00:32:41 -06:00
Nicolas Delaby
82ee2da750 Enforce environment values to be strings. 2015-05-23 15:52:36 +02:00
Nicole Thomas
7646cb16ea Merge pull request #24091 from rallytime/revert_test_removal 
Revert "Remove key management test from digital ocean cloud tests"
 2015-05-22 17:10:37 -06:00
Nicole Thomas
522ae92e38 Merge pull request #24079 from saltstack/revert-24061-develop 
Revert "Fix for https://github.com/saltstack/salt/issues/23221"
 2015-05-22 17:08:53 -06:00
Nicole Thomas
810297c847 Merge pull request #24069 from ticosax/check_is_running 
[dockerng] Introduce "start" argument to dockerng.running
 2015-05-22 17:04:38 -06:00
Nicole Thomas
0fcdb324c6 Merge pull request #24081 from jacobhammons/develop 
added custom search for each branch, fixed style issues
 2015-05-22 17:04:17 -06:00
rallytime
7146871d73 Revert "Remove key management test from digital ocean cloud tests" 
This reverts commit 1d031caa78.
 2015-05-22 15:33:40 -06:00
Nicole Thomas
8d940af074 Merge pull request #24087 from basepi/merge-forward-develop 
Merge forward from 2015.5 to develop
 2015-05-22 15:13:00 -06:00
Justin Findlay
c3744ef0db Merge pull request #24083 from swdream/swedream_Fix_code_block_syntax 
fix code block syntax
 2015-05-22 13:56:17 -06:00
Colton Myers
4b7ef52736 Use six.string_types 2015-05-22 13:04:57 -06:00
Colton Myers
d7362bb5dd Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    salt/states/file.py
    salt/utils/event.py
 2015-05-22 13:02:54 -06:00
Colton Myers
bfd812c56b Merge pull request #24065 from makinacorpus/real23883 
continue to fix #23883
 2015-05-22 12:59:21 -06:00
thanhnt
01b546e6e8 fix code block syntax 2015-05-23 00:57:42 +07:00
Jacob Hammons
1e1eb2b3ea added custom search for each branch, fixed style issues 2015-05-22 11:53:33 -06:00
Mathieu Le Marec - Pasquet
028282e01d continue to fix #23883 
Signed-off-by: Mathieu Le Marec - Pasquet <kiorky@cryptelium.net>
 2015-05-22 19:42:30 +02:00
Justin Findlay
e85f80a131 Revert "Fix for https://github.com/saltstack/salt/issues/23221" 2015-05-22 11:10:41 -06:00