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
70,456 Commits 24 Branches 182 Tags 341 MiB
2ecc4129b0
Commit Graph

70456 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
2ecc4129b0 Automated test for sleeping minion (#34149) 
Closes #34147
 2016-06-20 19:07:55 -04:00
Joseph Hall
9d0ae85f87 Handle DeserializationError (#34150) 2016-06-20 17:34:09 -04:00
Thomas S Hatch
3543b90f5c Merge pull request #34024 from richardscollin/system-date-module 
Add get/set datetime functionality - system module
 2016-06-20 13:38:17 -06:00
Thomas S Hatch
3dbf7119ce Merge pull request #34088 from Unity-Technologies/osx/mac_defaults_absent 
Osx/mac defaults absent
 2016-06-20 13:30:40 -06:00
Mike Place
0f7ba1b27d Merge pull request #34144 from rallytime/pr-template-contributing 
Add link to contributing guide to GitHub PR template
 2016-06-20 11:53:28 -07:00
C. R. Oldham
50f1974914 Merge pull request #32979 from iggy/no-hard-timeout 
salt-cloud - vultr - Change hard_timeout value to avoid use of timeout command
 2016-06-20 11:36:53 -06:00
Collin Richards
b9b3d77430 Fix more pep8 issues 2016-06-20 12:05:05 -05:00
rallytime
67ffe706c9 Add link to contributing guide to GitHub PR template 2016-06-20 10:31:44 -06:00
Benedikt Heine
59ceea2bd1 doc: add missing dot (#34128) 2016-06-20 10:59:29 -04:00
Mike Place
90094c2ae2 Fix reference error in adb module (#34112) 
The Py3 transition exposed a subtle bug in the adb becaon. We need
a unique list object for the last_state keys, or we'll be referencing
a dict that we'll modify inside some of the function loops in certain cases.
 2016-06-20 10:27:40 -04:00
Nicole Thomas
3382bc5c28 Merge pull request #34076 from rallytime/merge-develop 
[develop] Merge forward from 2016.3 to develop
 2016-06-17 15:13:30 -04:00
Henrik Holmboe
523b2acae9 return_valute -> return_value (#34091) 2016-06-17 13:02:07 -04:00
rallytime
0f92f3420d Change 'Suse' to 'SUSE' in inspect_collector_test 
This is needed due to the change in #33564
 2016-06-17 10:56:42 -06:00
Thomas S Hatch
c05296b035 Merge pull request #34004 from isbm/isbm-no-minionid-sorting-dev 
Complete rewrite how Minion ID is generated (dev)
 2016-06-17 09:15:58 -06:00
Daniel Hobley
182373344e Moved to using run_all in the absent function 
- Fixed unit tests
 2016-06-17 16:13:38 +02:00
joelc
f16839c83b typo 2016-06-17 08:31:49 -05:00
joelc
ec31f7a7d4 Adds delete functionality to mac_defaults 2016-06-17 08:25:42 -05:00
rallytime
d957c29704 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/master.py
  - salt/utils/parsers.py
 2016-06-16 17:08:39 -06:00
Nicole Thomas
f2a2c2bf53 Merge pull request #34073 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-06-16 19:02:31 -04:00
rallytime
f6bfaede21 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - doc/topics/installation/index.rst
  - salt/master.py
  - salt/modules/mac_brew.py
  - salt/modules/pacman.py
  - salt/modules/solarisips.py
  - salt/returners/postgres_local_cache.py
  - salt/states/apache_module.py
  - salt/utils/minions.py
  - tests/unit/acl/client_test.py
 2016-06-16 16:10:41 -06:00
Thomas S Hatch
1b76de1557 Merge pull request #34069 from rallytime/test-minion-return-message 
Add a test to check for disconnected minion messaging
 2016-06-16 15:18:38 -06:00
Thomas S Hatch
5a792caa57 Merge pull request #34068 from jfindlay/disk_capacity 
Add docs and tests to disk state
 2016-06-16 15:18:13 -06:00
Thomas S Hatch
3119693dac Merge pull request #34048 from terminalmage/issue30100 
RFC: proposed fix for multiple fileserver updates in masterless runs
 2016-06-16 15:10:59 -06:00
Thomas S Hatch
790384f413 Merge pull request #34010 from terminalmage/issue33831 
Do not cache remote files if they are already cached
 2016-06-16 15:03:47 -06:00
Thomas S Hatch
dd26d6fd74 Merge pull request #34009 from rallytime/bp-33948 
Back-port #33948 to 2016.3 + add log message
 2016-06-16 15:01:09 -06:00
Thomas S Hatch
404da7a87f Merge pull request #33998 from jizhilong/redis-return 
fix redis_return's clean_old_jobs.
 2016-06-16 14:57:45 -06:00
Thomas S Hatch
5f4ef46d2f Merge pull request #33941 from cachedout/issue_33927 
Don't call os.getppid() on Windows
 2016-06-16 14:56:17 -06:00
Thomas S Hatch
ccc07c8d32 Merge pull request #33762 from plastikos/bug-proxy_exit_status 
[BUG] proxy exit status
 2016-06-16 14:53:07 -06:00
Thomas S Hatch
45bf152ba1 Merge pull request #33580 from martinhoefling/nocache 
Option to allow scheduled jobs to return the result but not being cached on the master side.
 2016-06-16 14:20:37 -06:00
rallytime
60561ac6fc Add a test to check for disconnected minion messaging 2016-06-16 14:07:05 -06:00
Anthony Elizondo
2d7ce4cde1 Typo fix (#34066) 2016-06-16 15:04:04 -04:00
Justin Findlay
dca04727b5 states.disk: rewrite unit tests 2016-06-16 12:49:36 -06:00
Justin Findlay
c4196c9336 states.disk.status: validate percent values 2016-06-16 12:49:36 -06:00
Justin Findlay
e6d2b6797b states.disk: add documentation 2016-06-16 12:49:32 -06:00
jacobhammons
fa253aa62b Merge pull request #34067 from jacobhammons/mobile-fix 
Fixes doc refresh bug on chrome mobile.
 2016-06-16 12:44:12 -06:00
Jacob Hammons
ce027fd769 Fixes doc refresh bug on chrome mobile. 2016-06-16 12:43:33 -06:00
Thomas S Hatch
c76123767c Merge pull request #33903 from meaksh/salt-os-family-does-not-detect-SLES-for-SAP 
Fetching grains['os'] from /etc/os-release on SUSE systems if it is possible
 2016-06-16 11:21:09 -06:00
Thomas S Hatch
bf3e7c83b0 Merge pull request #33837 from lorengordon/masterless-orchestration 
Support salt.state orchestration in masterless mode
 2016-06-16 11:16:53 -06:00
Thomas S Hatch
dd03024931 Merge pull request #34011 from rallytime/bp-33948-2015.8 
Back-port #33948 and #34009 to 2015.8
 2016-06-16 09:41:01 -06:00
Antoine Jacoutot
afd7836711 _active_mounts_openbsd: unbreak output for special filesystems (#34057) 
mount(8) output is a little bit different on OpenBSD between local and special
or remote filesystems (e.g. tmpfs or nfs). These do not use a UUID nor a device.

https://github.com/saltstack/salt/issues/34012
 2016-06-16 11:29:37 -04:00
Tim Egbert
bca437128e Fixed a bug in the consul.py module that was preventing services (#34051) 
from registering in consul.agent_service_register. A nonexistent
dict key was being referenced, causing an Excpetion and failure to
register the service. This fix required only changing the offending
line to use the "get" method and supplying a default value.
 2016-06-16 11:20:41 -04:00
Nicole Thomas
03955dc204 Merge pull request #34052 from rallytime/merge-forward-develop 
[develop] Merge forward from 2016.3 to develop
 2016-06-16 11:10:02 -04:00
Nicole Thomas
a20b25c79b Back-port #34026 to 2016.3 (#34050) 
* removed method that doesn't work

* added logic for method removed in recent version
 2016-06-15 19:31:12 -04:00
rallytime
42489e33b2 Use the develop version of the disk state 2016-06-15 17:27:33 -06:00
rallytime
9d049e28e5 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/modules/win_pkg.py
  - salt/states/disk.py
 2016-06-15 17:13:26 -06:00
Collin Richards
be4a7c3f43 Fix more pylint issues 2016-06-15 17:50:05 -05:00
Thomas S Hatch
73ff11585e Merge pull request #33987 from isbm/isbm-inspectlib-cleanup 
inspectlib cleanup
 2016-06-15 16:09:31 -06:00
Erik Johnson
715e7af8a4 Ensure only one fileserver update in a masterless run 
Resolves #30100.
 2016-06-15 14:49:27 -05:00
bensherman
cce6bfaec8 removed method that doesn't exist (#34026) 
* removed method that doesn't work

* added logic for method removed in recent version
 2016-06-15 15:43:19 -04:00
Jorge Schrauwen
13b660cdf7 fix #34038 (#34042) 2016-06-15 15:42:19 -04:00