valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
54,940 Commits 24 Branches 182 Tags 341 MiB
1779b6832f
Commit Graph

54940 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas S Hatch
1779b6832f Merge pull request #24837 from gashev/add_trusted_host_option_to_pip 
Added --trusted-host option to pip.installed.
 2015-06-22 16:35:49 -04:00
Justin Findlay
b72b392da5 Merge pull request #24848 from nmadhok/patch-1 
Correcting bash code blocks
 2015-06-22 10:18:03 -06:00
Justin Findlay
7d1d195026 Merge pull request #24847 from borutmrak/develop 
unset size parameter for lxc.create when backing=zfs
 2015-06-22 10:17:05 -06:00
Justin Findlay
f5024023f8 Merge pull request #24839 from infestdead/develop 
fix for issue #24799
 2015-06-22 10:14:24 -06:00
Thomas S Hatch
650891c923 Merge pull request #24831 from DSRCompany/cherrypy_timeout 
Cherrypy timeout
 2015-06-22 11:27:13 -04:00
Thomas S Hatch
df3a069cfc Merge pull request #24742 from The-Loeki/tempmodule 
Contribution: Module for creating temporary files & dirs
 2015-06-22 11:23:29 -04:00
Nicole Thomas
6fa7e5c5f2 Merge pull request #24833 from rallytime/fix_linode_tests 
Fix linode cloud tests
 2015-06-20 14:15:09 -06:00
Nicole Thomas
f07308e69f Merge pull request #24844 from rallytime/merge_forward_develop 
Merge forward from 2015.5 to develop
 2015-06-20 14:14:51 -06:00
Nitin Madhok
cb54c7b169 Correcting bash code blocks 2015-06-20 04:19:11 -04:00
Borut Mrak
9fab34fb0c unset size parameter for lxc.create when backing=zfs 
When using the lxc.create parameter backing=zfs the default 1G size parameter kicks in, which sadly makes the lxc-create call fail.

LXC backing store type zfs does not support setting the container storage size ATM.

This fixes this error message in the minion log:

2015-06-20 02:00:57,588 [salt.minion      ][ERROR   ][3694] A command in 'lxc.create' had a problem: Container could not be created with cmd 'lxc-create -n test-container -t download -B zfs --fssize 1G -- --release trusty --arch amd64 --dist ubuntu': filesystem type and size are only valid with block devices
 2015-06-20 02:19:14 +02:00
Joseph Hall
04ce5f2510 Merge pull request #24843 from rallytime/update_linode_docs 
Update Linode docs to reflect rest API change
 2015-06-19 16:55:18 -06:00
rallytime
a306216ab9 Merge branch '2015.5' into merge_forward_develop 2015-06-19 16:37:56 -06:00
Joseph Hall
d716fa584e Merge pull request #24840 from rallytime/linode_reboot 
Add missing reboot function to linode driver
 2015-06-19 16:27:03 -06:00
rallytime
9b4b6bce64 Add rest api change to release notes 2015-06-19 16:21:24 -06:00
rallytime
b3ef394abe Clean up 2015-06-19 16:17:56 -06:00
rallytime
ddab875177 Update linode rest driver docs 2015-06-19 16:15:13 -06:00
rallytime
3694312157 Add missing reboot function to linode driver 2015-06-19 15:51:50 -06:00
jacobhammons
1a0044d6c6 Merge pull request #24835 from ticosax/fix-doc-links 
[doc] Fix anchors
 2015-06-19 15:51:00 -06:00
ipm
ec491df846 fix for issue #24799 2015-06-20 00:43:46 +03:00
Oleg Gashev
6dcafea09d Added --trusted-host option to pip.installed. 
Example:

test:
  pip.installed:
    - name: https://192.168.122.50/a-0.1.tar.gz
    - trusted_host: 192.168.122.50
 2015-06-19 19:58:03 +00:00
Nicole Thomas
2d8148fb4d Merge pull request #24834 from rallytime/bp-24811 
Back-port #24811 to 2015.5
 2015-06-19 12:43:49 -06:00
Nicolas Delaby
7b15d54a74 Fix anchors 2015-06-19 19:28:49 +02:00
Justin Findlay
d2edb63cff Merge pull request #24790 from rallytime/bp-24741 
Back-port #24741 to 2015.5
 2015-06-19 11:25:58 -06:00
Justin Findlay
645e62a43c Merge pull request #24789 from rallytime/bp-24717 
Back-port #24717 to 2015.5
 2015-06-19 11:17:00 -06:00
Justin Findlay
c69650aa5f Merge pull request #24817 from rallytime/enable_gogrid_tests 
Make the GoGrid Cloud Provider Tests work
 2015-06-19 11:14:51 -06:00
Justin Findlay
0a6c70f062 Merge pull request #24823 from jayeshka/splunk_search-states-unit-test 
adding states/splunk_search unit test case.
 2015-06-19 11:14:12 -06:00
rallytime
e2684ecf0b Add notes to map and gogrid docs -- don't use -P with map files 2015-06-19 11:02:06 -06:00
rallytime
c56d3150ec Fix linode cloud tests 2015-06-19 10:55:12 -06:00
Joseph Hall
d299475d34 Merge pull request #24796 from rallytime/deprecate_provider_for_driver 
Deprecate using "provider" in favor of "driver" in cloud provider files
 2015-06-19 09:43:26 -06:00
Dmitry Kuzmenko
a9b33c6a01 add rest_timeout master config option and jobs?timeout=... rest param 2015-06-19 18:42:56 +03:00
Dmitry Kuzmenko
954ba6eba9 Fixed GET /jobs/<id> requests 2015-06-19 18:42:56 +03:00
Mike Place
6fcff4d388 Merge pull request #24794 from alprs/feature-pillar_keys 
Add module function "pillar.keys"
 2015-06-19 09:24:02 -06:00
Mike Place
4c5a708599 Merge pull request #24809 from jodv/single_item_master_list 
Correctly create single item list for failover master type with string value for master opt
 2015-06-19 09:22:20 -06:00
Justin Findlay
df74df3922 Merge pull request #24360 from dr4Ke/unit_tests_state_grains_develop 
more complete unit tests for state grains
 2015-06-19 09:10:08 -06:00
Christophe Drevet-Droguet
ed4d0646a4 unit tests for state grains: use a subdirectory for config file 
This way, there is no /tmp/grains created on test execution. And the issue
with test_absent_delete is always triggered.
Maybe we should use mocked files, but I'm not sure how to do it.
 2015-06-19 12:49:48 +02:00
Christophe Drevet-Droguet
4d1810bf4e fix weird error in test test_absent_delete 
In the function grains.setvals, when deleting a key (destructive=True),
the __grains__ var, containing the current grains was updated only if
the grains file actually contained the key. In this test, it was not the
case because the grains file is not actually used, but the current grains
var was set manually.
 2015-06-19 12:49:47 +02:00
Christophe Drevet-Droguet
ff5267b1b6 trying to fix jenkins error 
There are many jenkins errors on linode CentOS7. The function `saltutil.sync_grains`
does not seem to be mocked correctly on this platform.

Based on 1f5836d0bb
 2015-06-19 12:49:28 +02:00
Jayesh Kariya
98831a8cb0 adding states/splunk_search unit test case. 2015-06-19 15:15:49 +05:30
Christophe Drevet-Droguet
650fa90b97 more complete unit tests for state grains 2015-06-19 09:20:23 +02:00
rallytime
4a0626bf27 Python 3 compat fix 2015-06-18 18:42:04 -06:00
rallytime
5c137c86ad Make the GoGrid Cloud Provider Tests work 2015-06-18 17:08:57 -06:00
rallytime
5c5dfc557b More aws --> ec2 references 2015-06-18 16:12:13 -06:00
rallytime
4de5afbe53 Replace references to aws with ec2 2015-06-18 16:06:57 -06:00
Joseph Hall
0245ea1b58 Merge pull request #24811 from rallytime/gogrid_map_warning 
Add notes to map and gogrid docs -- don't use -P with map files
 2015-06-18 14:58:50 -06:00
rallytime
61de27a075 Bah! Fix more whitespace. 2015-06-18 14:46:25 -06:00
Mike Place
d2fff57d5c Merge pull request #24812 from cachedout/win_status_lint 
Lint win_status
 2015-06-18 14:29:41 -06:00
Mike Place
f3b06081fc Lint win_status 2015-06-18 14:29:19 -06:00
rallytime
d045fb579e Add notes to map and gogrid docs -- don't use -P with map files 2015-06-18 14:25:20 -06:00
Colton Myers
da8b637d4d Merge pull request #24804 from basepi/merge-forward-develop 
Merge forward from 2015.5 to develop
 2015-06-18 14:12:01 -06:00
Colton Myers
ae05e70e94 Merge pull request #24802 from basepi/merge-forward-2015.5 
[2015.5] Merge forward from 2014.7 to 2015.5
 2015-06-18 14:11:58 -06:00