valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
75,628 Commits 24 Branches 182 Tags 341 MiB
eb04ed7eef
Commit Graph

75628 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
0889cbdb31 Merge pull request #38587 from rallytime/fix-37498 
Change daemontools __virtualname__ from service to daemontools
 2017-01-05 11:06:00 -07:00
Tobias Thiel
9ec470b4a5 State Gem: fix incorrect warning about missing rvm/rbenv 2017-01-05 17:50:51 +01:00
rallytime
2a5880966f Change daemontools __virtualname__ from service to daemontools 
Fixes #37498

When `__virtualname__` is set to `service` in the daemontools execution
module, it overrides the default system-wide service provider. We need
to keep the default service provider, since daemontools is a third-party
service.
 2017-01-05 11:03:50 -05:00
rallytime
1f6b540e46 Make sure the pidfile and log_file values are overriden by api opts 2017-01-05 10:22:05 -05:00
Robin Björklin
04d307f917 salt-api no longer forces the default timeout 
Conflicts:
  - salt/config/__init__.py
 2017-01-05 10:19:56 -05:00
rallytime
1fe945df5e Allow memusage beacon to load on Windows 
As long as python-psutil is installed, this should be able to work.

Fixes #38462

See #38462 for more information.
 2017-01-05 10:05:28 -05:00
Nicole Thomas
14b643fd48 Merge pull request #38570 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2017-01-05 09:28:37 -05:00
Mircea Ulinic
dea7866d57
Update net.load_template doc: 2016.11.2 2017-01-05 11:24:10 +00:00
Mircea Ulinic
62bee3c793
Fix function headers as per #38499 2017-01-05 11:09:15 +00:00
Bas Dusee
e3a883c915 Small fix on the fix regarding indentation 2017-01-05 11:16:19 +01:00
rallytime
30f14d15df Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/config/__init__.py
  - salt/engines/slack.py
 2017-01-04 16:54:58 -05:00
Aditya Kulkarni
67879ebe65 Create queue if one doesn't exist 2017-01-04 15:40:47 -05:00
Mike Place
9a1550d336 Merge pull request #38509 from mostafahussein/2016.11 
Stop request from being processed if bad ip
 2017-01-04 13:05:43 -07:00
Mike Place
bc07d420e9 Merge pull request #38522 from kkoppel/fix-issue-38518 
Fix usage of salt.utils.http.query in slack_notify.call_hook
 2017-01-04 13:04:56 -07:00
Mike Place
7b74436d13 Merge pull request #38562 from rallytime/arch-install-docs 
Update arch installation docs with correct package name
 2017-01-04 13:04:27 -07:00
Mike Place
01860702cb Merge pull request #38560 from Ch3LL/fix_api_log 
fix api logfile
 2017-01-04 12:03:17 -07:00
rallytime
8b1897ace9 Update arch installation docs with correct package name 
When 2016.11.0 was released, the naming of the salt package was
changed. The salt-zmq version is now named just "salt" and the
salt-raet pacakge is no longer being updated.
 2017-01-04 13:08:47 -05:00
Ch3LL
1b45e9670b fix api logfile 2017-01-04 10:55:13 -07:00
Mike Place
42fef270ee Merge pull request #38527 from rbjorklin/api-timeout-fix 
salt-api no longer forces the default timeout
 2017-01-04 10:10:14 -07:00
Mike Place
1895eb7533 Merge pull request #38529 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2017-01-04 10:06:56 -07:00
Mike Place
0056620a53 Merge pull request #38531 from rallytime/bp-33601 
Back-port #33601 to 2016.3
 2017-01-04 09:56:52 -07:00
Mike Place
ec4f118ca2 Merge pull request #38539 from twangboy/dsc_int_checks 
Fix DSC LCM Config int checks
 2017-01-04 09:56:26 -07:00
Mike Place
5657fd1956 Add repr flag for str 2017-01-04 08:44:53 -07:00
Mike Place
50242c7f17 Merge pull request #38541 from techhat/issue38187 
Strip user:pass from cached URLs
 2017-01-04 08:39:56 -07:00
Mike Place
53449c89a5 Merge pull request #38549 from meaksh/2016.11-snapper-multiple-subvolumen-support 
Adding multiple SUBVOLUME support and some fixes to the Snapper module
 2017-01-04 08:32:29 -07:00
Mike Place
325dc56e59 Merge pull request #38554 from multani/fix/30454 
Fix YAML deserialization of unicode
 2017-01-04 08:31:16 -07:00
David Boucha
4ddbc2ecaa add note about pyVmomi locale workaround (#38536) 2017-01-04 09:24:04 -05:00
Nicole Thomas
d43beab738 Move boto_vpc.describe_route_table deprecation version to Oxygen (#38545) 
Deprecations need 2 feature releases before we can remove them.

This deprecation notice appeared first in 2016.11, so we need to
allow a little more time to adapt to the change.
 2017-01-04 09:13:28 -05:00
Megan Wilhite
1c951d152b fix gce image bug (#38542) 2017-01-04 09:08:04 -05:00
Jonathan Ballet
2e7f743371 yaml: support unicode serialization/deserialization 
Fix: #30454
 2017-01-04 13:29:28 +01:00
Jonathan Ballet
df76113c5c jinja: test the "yaml" filter with ordered dicts 2017-01-04 13:29:28 +01:00
Jonathan Ballet
f7712d417f Revert "Add yaml_safe filter" 
This reverts commit 2405ff11b5.

This never worked:

* yaml_txt is stripped and never ends with a '\n'
* len(string - 5) doesn't work
* yaml.safe_dump() doesn't allow to set a custom Dumper() (see
  10c55a6244/lib/yaml/__init__.py (__init__.py-212) )

Also, #36611 for related bug and fix.
 2017-01-04 13:29:28 +01:00
Pablo Suárez Hernández
ef26e93bb7 Some fixes and pylint 2017-01-04 11:51:22 +00:00
Pablo Suárez Hernández
1e6ba45db4 Fixes pre/post snapshot order to get the inverse status 2017-01-04 09:00:20 +00:00
Pablo Suárez Hernández
68d5475c1f Fixing Snapper unit tests for SUBVOLUME support 2017-01-04 08:59:51 +00:00
Pablo Suárez Hernández
e9919a913f Removing posible double '/' from the file paths 2017-01-04 08:59:51 +00:00
Pablo Suárez Hernández
8b4f87f226 Updating and fixing the documentation 2017-01-04 08:59:50 +00:00
Pablo Suárez Hernández
edea45272a Raises "CommandExecutionError" if snapper command fails 2017-01-04 08:59:50 +00:00
Pablo Suárez Hernández
3841e1143b Only include diff in the state response if include_diff is True 2017-01-04 08:59:48 +00:00
Joseph Hall
eae3a435dd Strip user:pass from cached URLs 2017-01-03 13:28:37 -07:00
twangboy
aea4219502 Fix DSC LCM Config int checks 2017-01-03 13:14:48 -07:00
Christian McHugh
c36cb39825 remove the unnecessary double trigger 2017-01-03 10:51:30 -05:00
Christian McHugh
38414493bf fix spacing lint error 2017-01-03 10:51:30 -05:00
Christian McHugh
8c1defc710 Remove uncessary type from alias commands. 
Deduplicate alias handling to autodetect function selection.
Add error reporting to slack connectivty problems.
Cleanup slack's unicode conversion
 2017-01-03 10:51:30 -05:00
Christian McHugh
c2f23bc45e Fix slack engine to run on python2.6 2017-01-03 10:50:47 -05:00
rallytime
85f470207c Merge branch '2016.3' into '2016.11' 
No conflicts.
 2017-01-03 10:13:06 -05:00
Mostafa Hussein
8847289c3e remove commented code 2017-01-03 14:56:49 +02:00
Robin Björklin
0202f68820 salt-api no longer forces the default timeout 2017-01-03 13:28:35 +01:00
Kristjan Koppel
ff1e7f0c71 Fix usage of salt.utils.http.query in slack_notify.call_hook 
Fixes #38518
 2017-01-03 10:40:46 +02:00
Pablo Suárez Hernández
7803e7716c Adds multiple SUBVOLUME support to the Snapper module 2017-01-02 16:11:52 +00:00