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
71,764 Commits 24 Branches 182 Tags 341 MiB
1607da0841
Commit Graph

71764 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
twangboy
1607da0841 Better fix 2016-07-28 09:48:09 -07:00
twangboy
5ca2f15664 Fix test_issue_1896... for Linux 2016-07-28 09:33:23 -07:00
twangboy
d409a51bec Add missing state file for windows 2016-07-27 15:23:51 -07:00
twangboy
55cb909f68 Fix two more tests for Windows 2016-07-27 15:17:36 -07:00
Mike Place
b424f5cec6 Merge pull request #34875 from oms4suse/wip_add_ceph 
Wip add ceph
 2016-07-27 12:07:14 -06:00
Mike Place
1534b143e2 Merge pull request #34772 from kerick/ddns-port-work 
ddns: Add support for user defined nameserver port/TSIG key algorithm
 2016-07-27 12:05:40 -06:00
Mike Place
2a0255fb0a Lint postgres returner (#34995) 
Refs #34476
 2016-07-27 11:33:08 -06:00
Mike Place
e28d2bc5ed Merge pull request #34476 from kriberg/update-postgres-returner 
Updated postgres returner to support new API
 2016-07-27 11:29:25 -06:00
Mike Place
1067c17095 Merge pull request #34826 from rallytime/unit-module-py3-tests 
Python 3 compatibility fixes (execution module unit tests)
 2016-07-27 11:24:00 -06:00
Mike Place
eb8ffab057 Merge pull request #34857 from eradman/blockreplace 
Preserve ownership for blockreplace backup files
 2016-07-27 11:21:36 -06:00
Mike Place
3c76214f99 Merge pull request #34990 from rallytime/decode-bytes-integration-init 
Decode byte strings when running tests in Python 3
 2016-07-27 11:02:12 -06:00
rallytime
83d3ac4771 Decode byte strings when running tests in Python 3 2016-07-27 10:34:34 -06:00
Mike Place
a988d42209 Merge pull request #34936 from bebehei/bashcompletion-cache 
Bash-completion cache output and improve behavior
 2016-07-27 09:00:03 -06:00
Mike Place
28268208f9 Merge pull request #34937 from twangboy/int_tests_cp 
Fix test_list_minion for Windows
 2016-07-27 08:53:45 -06:00
Mike Place
847d8ea95f Merge pull request #34939 from twangboy/int_tests_git 
Fix git integration tests for Windows
 2016-07-27 08:44:35 -06:00
Mike Place
ed65a27377 Merge pull request #34965 from xlotlu/patch-1 
grafana_datasource: fix missing name in state return
 2016-07-27 08:37:56 -06:00
Mike Place
d1e808254e Merge pull request #34968 from rallytime/fix-34967 
Older versions of psutil may not have the 'children' attribute for processes
 2016-07-27 08:37:04 -06:00
Mike Place
6323723035 Merge pull request #34974 from thatch45/regen_thin 
Regen the thin tarball option
 2016-07-27 08:23:54 -06:00
Mike Place
054539a830 Merge pull request #34942 from jacksontj/develop 
Fix file.managed test=true hiding errors
 2016-07-26 16:24:43 -06:00
Thomas S Hatch
265b1dd7fb also wipe when regen thin 2016-07-26 16:19:57 -06:00
Thomas S Hatch
423a356ff5 Regen the thin tarball option 2016-07-26 16:15:20 -06:00
Mike Place
9cd052f07f Merge pull request #34959 from terminalmage/utils-in-runners 
Make __utils__ dunder available in runner funcs
 2016-07-26 16:13:35 -06:00
Mike Place
0ed0e43aa9 Merge pull request #34964 from techhat/thorcalc 
Add Thorium module for performing calculations
 2016-07-26 16:12:57 -06:00
Mike Place
16ee70867a Merge pull request #34966 from whiteinge/minion-swarm-opts-dict 
Ensure 'data' remains a dictionary if conf file is empty or missing
 2016-07-26 16:11:56 -06:00
Benedikt Heine
5c45ac10e3 [bash-completion] remove old comment 2016-07-26 23:56:56 +02:00
Benedikt Heine
db58e62b0d [bash-completion] split modules and functions completion 
change behavior to complete modules and functions separately. This helps
gaining overview during completion.
 2016-07-26 23:56:56 +02:00
Benedikt Heine
99871f4c33 [bash-completion] cache function completions 
Cache the function completions. This may be neccessary if timeout is too
high and therefore you may get stuck on your input line.
 2016-07-26 23:56:56 +02:00
Erik Johnson
0c08724a7c Merge pull request #34118 from ctrlrsf/i-33907-dont-walk-file-ignore-dirs 
Don't traverse directories that match file_ignore_regex and file_ignore_glob
 2016-07-26 15:28:03 -05:00
rallytime
28d28aa82e Older versions of psutil may not have the 'children' attribute for processes 
We also should make sure the 'children' variable is instantiated before calling it.

Fixes #34967
 2016-07-26 13:46:31 -06:00
Seth House
ca61237de7 Ensure 'data' remains a dictionary if conf file is empty or missing 2016-07-26 12:41:42 -06:00
Ionuț Ciocîrlan
49278059e5 grafana_datasource: fix missing name in state return 2016-07-26 21:40:00 +03:00
Joseph Hall
7251e62345 Update docstrings 2016-07-26 12:34:01 -06:00
Nicole Thomas
73d3b77a2c Merge pull request #34960 from rallytime/merge-develop 
[develop] Merge forward from 2016.3 to develop
 2016-07-26 12:32:41 -06:00
Joseph Hall
9c2cc6bf99 Add Thorium module for performing calculations 2016-07-26 12:30:22 -06:00
Mike Place
55bb3d09ab Merge pull request #34919 from tonybaloney/libcloud_dns_states 
Add a new state module for managing DNS records and zones through Libcloud
 2016-07-26 11:51:08 -06:00
twangboy
d0a96181e6 Clarify lowercase checking 2016-07-26 10:39:54 -07:00
twangboy
3c0cf59565 Fix lint 2016-07-26 10:34:54 -07:00
Erik Johnson
7b22b6b0e6 Add new runner feature to Carbon release notes 2016-07-26 12:29:59 -05:00
Mike Place
21e0ae8d30 Merge pull request #34925 from BrickXu/develop 
pv_present should execute pvcreate with -y if existing filesystem sig…
 2016-07-26 11:28:57 -06:00
Mike Place
407604601d Merge pull request #34943 from terminalmage/zd868 
Add jid to orchestration returns
 2016-07-26 11:23:58 -06:00
Mike Place
b29d3c95a8 Merge pull request #34932 from bebehei/fix-hide-timeout 
[bash-completion] hide timeout in salt-output
 2016-07-26 11:18:59 -06:00
Erik Johnson
33489cc60c Add runner func to sync custom utils to master 2016-07-26 12:06:34 -05:00
Erik Johnson
9cb6115c7e Load and pack utils into runner funcs 2016-07-26 12:06:34 -05:00
rallytime
76e8dd974a Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/state.py
  - tests/integration/__init__.py
  - tests/integration/wheel/key.py
 2016-07-26 11:05:24 -06:00
Mike Place
deb1331601 Merge pull request #34935 from rallytime/beacons-mod-cleanup 
Avoid UnboundLocalError in beacons module
 2016-07-26 11:01:23 -06:00
Erik Johnson
eb1ed51235 Add the ability to pack __utils__ dunder into runner funcs 2016-07-26 11:55:24 -05:00
Mike Place
d80350cdcc Increase all run_script timeouts to 30s (#34956) 2016-07-26 10:54:45 -06:00
Shane Lee
84e2e8b101 Fix grains integration tests for Windows (#34941) 2016-07-26 10:49:10 -06:00
Anthony Shaw
6c08afd62b GCE Cloud tests (#34871) 
* add test module

* modify GCE tests to remove mocks

* use certifi, libcloud has also patched the SuSE/Mac cert issues

* skip cert checking

* validate the __virtual__ and import process

* fix munged merge

* fixed lint errors and failing test

* fix dimensiondata tests in the same way whilst I'm here
 2016-07-26 09:24:20 -06:00
Joseph Hall
cdc9882f83 Create regdata before try/except (#34931) 2016-07-26 09:05:24 -06:00