Commit Graph

50020 Commits

Author SHA1 Message Date
Damian Myerscough
e81ffa190c New features and bug fixes 2015-04-02 09:27:20 -07:00
jfindlay
9e509864e1 Merge pull request #22271 from lyft/add-connecting-settings-elb
Add support for idle connection settings to boto_elb modules
2015-04-01 22:14:50 -06:00
Ryan Lane
48908fde72 Show required version of boto in documentation 2015-04-01 19:28:51 -07:00
Ryan Lane
c7b3731ebc Add support for idle connection settings to boto_elb modules 2015-04-01 19:24:08 -07:00
Nicole Thomas
922c8f4d07 Merge pull request #22264 from rallytime/pylint-dev
Pylint dev
2015-04-01 16:42:23 -06:00
Thomas S Hatch
9bdfb1be0e Merge pull request #22263 from cachedout/workaround_msgpack_corruption
Prevent a load from being written if one already exists
2015-04-01 16:41:33 -06:00
rallytime
d7cc79fff5 Python 3 Compat for salt/states/x509.py 2015-04-01 15:56:14 -06:00
rallytime
a0ffaf9a3c Use salt's OrderedDict for Python 2.6 2015-04-01 15:54:57 -06:00
rallytime
e141c61bfd Python 3 Compat for salt/modules/x509.py 2015-04-01 15:54:36 -06:00
jfindlay
53c0333b82 Merge pull request #22260 from dmyerscough/nginx-build-arguments
Allow you to view the build arguments
2015-04-01 15:24:06 -06:00
Mike Place
07191fe061 Prevent a load from being written if one already exists
This is a workaround for a problem introduced when loads are being written on returns, which was originally introduced to ensure that a load is *always* written, even if run in masterless mode or from lower-level masters in a syndic setup.

Ultimately, we'll want to re-address that strategy but this prevents the corrupted loads for the time being.
2015-04-01 15:22:36 -06:00
Nicole Thomas
2a99726045 Merge pull request #22259 from techhat/azurefix
Add missing import for Azure
2015-04-01 14:51:01 -06:00
Damian Myerscough
ce198a4d49 Only split values outside of single quotes 2015-04-01 13:27:39 -07:00
Damian Myerscough
f70f462666 Allow you to view the build arguments 2015-04-01 13:09:52 -07:00
Joseph Hall
cb14803109 Add missing import for Azure 2015-04-01 13:47:10 -06:00
Thomas S Hatch
6e547891bd Merge pull request #22251 from mgwilliams/boto_vpc2
refactor boto_vpc to cache ids and eliminate duplicate code
2015-04-01 13:03:40 -06:00
Matthew Williams
6349352743 boto_vpc_test: fix name->subnet_name 2015-04-01 17:50:51 +00:00
Thomas S Hatch
c608f02767 Merge pull request #22250 from The-Loeki/smbios-module
Contribution: An 'advanced' SMBIOS / dmidecoder parse module
2015-04-01 11:02:22 -06:00
Matthew Williams
89870b9146 fix typo in boto_vpc tests 2015-04-01 16:57:54 +00:00
Matthew Williams
f8956273f5 stats.boto_vpc: remove duplicate definition of subnet_present 2015-04-01 16:47:25 +00:00
Matthew Williams
ff6db62d67 Merge remote-tracking branch 'origin/develop' into boto_vpc2 2015-04-01 16:42:10 +00:00
Thomas S Hatch
c62763744f Merge pull request #22194 from clinta/x509
New module and state: x509
2015-04-01 10:36:12 -06:00
Thomas S Hatch
9e9af6e051 Merge pull request #22249 from claudiupopescu/boto_vpc_describe_route_table
Boto VPC describe route table
2015-04-01 10:35:29 -06:00
Thomas S Hatch
5dac1991b6 Merge pull request #22245 from achernev/develop
Fix grains.get_or_set_hash to work with multiple entries under same key
2015-04-01 10:32:04 -06:00
Ronald van Zantvoort
f52c4ebbdf Addition of SMBIOS / dmidecoder parse module 2015-04-01 18:16:31 +02:00
Matthew Williams
046fc79b5b fix typo 2015-04-01 16:09:51 +00:00
Matthew Williams
64f1fb5e71 refactor boto_vpc to cache ids and eliminate duplicate code 2015-04-01 16:03:10 +00:00
Claudiu Popescu
28597a53b4 Boto VPC describe route table 2015-04-01 17:39:20 +02:00
Mike Place
6566a5d0ad Merge pull request #22242 from claudiupopescu/boto_vpc_route_exists
Boto VPC check if route exists
2015-04-01 09:36:12 -06:00
Mike Place
8c4d064d9f Merge pull request #22243 from jayeshka/schedule-unit-test
adding schedule unit test
2015-04-01 09:34:13 -06:00
jfindlay
bdd543ab15 Merge pull request #22237 from rahulhan/systemd_unit_test
Adding systemd.py unit tests
2015-04-01 09:17:44 -06:00
jfindlay
450276d4f5 Merge pull request #22229 from rahulhan/reg_unit_tests
Adding Reg.py unit test cases
2015-04-01 08:49:14 -06:00
Clint Armstrong
a354fa5225 Merge branch 'develop' of https://github.com/saltstack/salt into x509 2015-04-01 10:19:04 -04:00
Clint Armstrong
93e7bb867e Better CRL handling, verify certificates and CRLs against keys in states 2015-04-01 10:17:37 -04:00
Anton Chernev
81746bcaee Fix grains.get_or_set_hash to work with multiple entries under same key 2015-04-01 14:36:47 +01:00
Jayesh Kariya
07ee9602f4 resolved error. 2015-04-01 18:58:43 +05:30
Clint Armstrong
2de64fd90b wrong quotes 2015-04-01 08:45:49 -04:00
Jayesh Kariya
2b6eccb75e adding schedule unit test 2015-04-01 18:11:48 +05:30
Claudiu Popescu
ecbb62d538 Allow to check if a route exists. 2015-04-01 14:04:30 +02:00
Rahul Handay
c50b842c66 Adding systemd.py unit tests 2015-04-01 14:59:16 +05:30
Rahul Handay
7ef848edc1 Adding Reg.py unit test cases 2015-04-01 11:14:27 +05:30
Thomas S Hatch
20d8f757dd Merge pull request #22226 from garethgreenaway/20107_job_race_condition
Fixes to scheduler
2015-03-31 21:55:57 -06:00
Gareth J. Greenaway
606a275cee Fixing a bug that pops up randomly if you have multiple jobs with multiple threads, jobs would be processed in one thread but an attempt to process in another thread would be attempted. The cache file would be removed after the other thread had gotten the list of cache file. Adding some code to bypass the processing if the file is already gone. 2015-03-31 17:25:12 -07:00
Nicole Thomas
48100905a9 Merge pull request #22213 from rallytime/pylint
Python 3 compat for salt/sdb/etcd_db.py
2015-03-31 15:19:29 -06:00
rallytime
1336796a2e Python 3 compat for salt/sdb/etcd_db.py 2015-03-31 14:14:46 -06:00
Clint Armstrong
8e6c6d8d8a Merge branch 'develop' of https://github.com/saltstack/salt into x509 2015-03-31 16:00:58 -04:00
jfindlay
9ffb8a6f60 Merge pull request #22203 from pass-by-value/pip_state_doc_add
Add doc about reload modules on pip state
2015-03-31 13:32:41 -06:00
Clint Armstrong
b75451e50e forgot CLI Example string 2015-03-31 14:13:25 -04:00
Aditya Kulkarni
ea60814320 Add doc about reload modules on pip state 2015-03-31 14:12:59 -04:00
Thomas S Hatch
ab44a43efe Merge pull request #22197 from cachedout/index_jids
Create an index for jids
2015-03-31 12:07:04 -06:00