valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
53,886 Commits 24 Branches 182 Tags 341 MiB
c4f5e231fa
Commit Graph

53886 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matthias Erll
ee4c9d59ab Use ids if user or group is not present. 2015-05-27 18:41:27 +02:00
Trevor Hammond
e2217a09e8 removed deprecated pymongo usage as no longer functional with pymongo > 3.x 2015-05-27 10:34:56 -06: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
4a8dbc7f13 Merge pull request #24153 from techhat/batchlist 
Batch mode sometimes improperly builds lists of minions to process
 2015-05-27 10:21:52 -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
Thomas S Hatch
ed8ccf57a2 Merge pull request #24167 from jayeshka/pagerduty-states-unit-test 
adding states/pagerduty unit test case.
 2015-05-27 10:14:01 -06:00
Ronald van Zantvoort
66fdb39fd5 Merge fix 
Merge fix for #24160
 2015-05-27 18:02:24 +02:00
Ronald van Zantvoort
2175ff3c75 doc & merge fix 
Fix doc & potential merge conflict w/#24168
 2015-05-27 18:00:51 +02:00
Nicole Thomas
987aeb1c17 Merge pull request #24173 from techhat/cookieerr 
Better error and cookie handling
 2015-05-27 09:57:24 -06:00
Ronald van Zantvoort
024f276829 doc fixes 2015-05-27 17:38:39 +02: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
Nicole Thomas
4e8c5031b0 Merge pull request #24159 from rallytime/keystone_doc_examples 
Fill out modules/keystone.py CLI Examples
 2015-05-27 09:07:11 -06:00
Nicole Thomas
fc10ee8ed5 Merge pull request #24158 from rallytime/fix_doc_error 
Fix test_valid_docs test for tls module
 2015-05-27 09:06:05 -06:00
Nicole Thomas
b9507d1567 Merge pull request #24156 from basepi/merge-forward-2015.5 
[2015.5] Merge forward from 2014.7 to 2015.5
 2015-05-27 09:05:01 -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
Ronald van Zantvoort
f1a2fa3724 Improvements to data module; behave much more like a dict 
Adding 
`keys()`
`items()`
`values()`
`pop`
`get`
`has_key`

methods for utilizing it much more like a dict

`get` supports both single keys and lists, deprecate `getval` and `getvals`
 2015-05-27 11:46:59 +02:00
Jayesh Kariya
8cf1505392 adding states/portage_config unit test case. 2015-05-27 14:55:31 +05:30
Jayesh Kariya
2234bb0b70 adding states/pkgng unit test case. 2015-05-27 14:54:19 +05:30
Jayesh Kariya
563a5b3c30 adding states/pecl unit test case. 2015-05-27 14:52:19 +05:30
Jayesh Kariya
1af8c8334d adding states/pagerduty unit test case. 2015-05-27 14:51:19 +05:30
Doug Luce
2e36b8a73f Fix indentation. 2015-05-27 02:08:35 -07:00
Ronald van Zantvoort
eba382cdda small enhancement to data module; pop() 
Very simple addon to allow to pop() values from data
 2015-05-27 02:42:49 +02:00
Nicole Thomas
05745fa931 Merge pull request #24145 from jfindlay/win_update_encoding 
attempt to decode win update package
 2015-05-26 17:20:20 -06: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
rallytime
dadac8d076 Fill out modules/keystone.py CLI Examples 2015-05-26 17:07:57 -06:00
rallytime
49a517e2ca Fix test_valid_docs test for tls module 
This will make 2014.7 happy again
 2015-05-26 16:45:33 -06:00
Colton Myers
60f2e9eefb Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    doc/topics/development/contributing.rst
    salt/modules/tls.py
 2015-05-26 16:38:42 -06:00
Colton Myers
e52b5ab2e2 Remove stray >>>>> 2015-05-26 15:51:56 -06:00
Colton Myers
7dfbd929ff Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 2015-05-26 15:51:15 -06:00
Joseph Hall
6655831048 Let lookup_jid show only missing minions 2015-05-26 15:25:59 -06:00
Colton Myers
70247890de Merge pull request #24123 from makinacorpus/ss 
fix service enable/disable change
 2015-05-26 15:24:19 -06:00
Joseph Hall
467ba64612 Make sure that minion IDs are strings 2015-05-26 15:09:34 -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
Justin Findlay
51c3cec5d7 Merge pull request #24146 from rallytime/fix_centos_boto_failure 
Fixes the boto_vpc_test failure on CentOS 5 tests
 2015-05-26 14:15:19 -06:00
C. R. Oldham
1c91a2176f Merge pull request #24144 from twangboy/fix_24052 
Compare Keys ignores all newlines and carriage returns
 2015-05-26 13:25:48 -06:00
rallytime
ac0f97de51 Fixes the boto_vpc_test failure on CentOS 5 tests 
pkg_resources.get_distribution doesn't work on CentOS 5 since it looks
for moto in site-packages and not pip (which is how we're installing it
in the salt-jenkins states).

This catches the exception through by get_distribution so we can run the
rest of the tests in this file.
 2015-05-26 12:25:51 -06:00
Justin Findlay
084166747c Merge pull request #24139 from rallytime/bp-24118 
Backport #24118 to 2015.5
 2015-05-26 12:24:27 -06:00
Justin Findlay
742eca29f7 Merge pull request #24138 from rallytime/bp-24116 
Backport #24116 to 2015.5
 2015-05-26 12:23:51 -06:00
Justin Findlay
e01536d098 Merge pull request #24137 from rallytime/bp-24105 
Backport #24105 to 2015.5
 2015-05-26 12:23:39 -06:00
Justin Findlay
cc5e17e61f attempt to decode win update package 
Fixes #24102.
 2015-05-26 12:00:23 -06:00
Erik Johnson
cce85d0cf8 Lint fixes 2015-05-26 12:58:43 -05:00
twangboy
c197b41494 Compare Keys removing all newlines and carriage returns 2015-05-26 17:34:14 +00: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
Colton Myers
9ef2c64098 Add docstring 2015-05-26 10:46:58 -06:00
Colton Myers
8579429314 Add in recursive_update from #24097 2015-05-26 10:46:19 -06:00
Colton Myers
8599143200 if key not in dest, don't recurse 2015-05-26 10:41:27 -06:00
Colton Myers
d8a84b3017 Rename klass to valtype 2015-05-26 10:40:37 -06:00
Justin Findlay
89cdf976e1 Merge pull request #24136 from rallytime/bp-24104 
Backport #24104 to 2015.5
 2015-05-26 09:58:47 -06:00