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

54956 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Hobley
0a9294d384 Fixed unit tests for win_powercfg 2015-06-23 09:39:35 +02:00
Daniel Hobley
c0bfa6aace Fixed powercfg on windows 7 2015-06-23 09:26:09 +02:00
Justin Findlay
7db3d7e285 Merge pull request #24868 from thusoy/patch-3 
Don't error log missing IFTTT keys
 2015-06-22 21:54:35 -06:00
Thomas S Hatch
25d78d341b Merge pull request #24825 from dh-harald/develop 
Fix password parsing in ssh sessions
 2015-06-22 17:19:03 -04:00
Thomas S Hatch
bc08ee3e32 Merge pull request #24857 from gtmanfred/develop 
add interfaces to subnets
 2015-06-22 16:37:33 -04:00
Thomas S Hatch
e488578338 Merge pull request #24845 from porterjamesj/patch-1 
fix bug in docker.loaded
 2015-06-22 16:36:36 -04:00
Thomas S Hatch
4f2b8975fb Merge pull request #24838 from rhealitycheck/feature-mongo-return-update-pymongo 
Feature mongo return update pymongo
 2015-06-22 16:36:14 -04:00
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
Tarjei Husøy
f0324d9655 Don't error log missing IFTTT keys 
Also uses the the tuple-variant of `__virtual__` by returning a tuple with the reason, which puts the reason in the debug log.
 2015-06-22 20:37:13 +02: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
Daniel Wallace
13a6f7b412 python 2.6 compatibility 2015-06-21 13:30:44 -05:00
Daniel Wallace
0d041732b9 add docs for subnets with interfaces 2015-06-21 12:58:42 -05:00
Daniel Wallace
c7f6819fdc add interfaces to subnets 
Sometimes I only want to know what subnets are available on a specific
interface instead of on all interfaces
 2015-06-21 12:57:35 -05: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
Peter Nyilas
376f6693cf fix for 02683f544e 2015-06-20 15:27:36 +01: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
James J Porter
35d2cff44b fix bug in docker.loaded 2015-06-19 17:39:57 -05: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
Rhea Ghosh
7f89f87c9f adding support for pymongo versions < 2.4 2015-06-19 15:55:35 -05:00
Rhea Ghosh
da82d88c39 updating from using deprecated Connection class to MongoClient class as per latest pymongo version 3.0.2, MongoClient is supported starting in pymongo 2.4 2015-06-19 15:17:58 -05: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
Peter Nyilas
02683f544e Fix password parsing in ssh sessions 2015-06-19 11:50:58 +01:00