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
73,757 Commits 24 Branches 182 Tags 341 MiB
087af91dcb
Commit Graph

73757 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nicole Thomas
414f7296fd Merge pull request #36233 from rallytime/merge-develop 
[develop] Merge forward from carbon to develop
 2016-09-12 11:40:18 -06:00
Erik Johnson
7b96197c5e Merge pull request #36137 from cachedout/issue_35423 
Allow highstate outputter to show all results
 2016-09-12 11:37:49 -05:00
rallytime
99dcf84b62 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-09-12 10:09:43 -06:00
rallytime
c3dcbb5906 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - salt/modules/win_pkg.py
  - salt/states/dockerng.py
  - salt/utils/process.py
 2016-09-12 09:47:33 -06:00
rallytime
87341ed30b Merge branch 'carbon' into 'develop' 
No conflicts.
 2016-09-12 09:42:26 -06:00
Valentin Rosavitskiy
63e49a3d86 Add support for new OS VZ7 try #2 (#35123) (#36230) 2016-09-12 09:36:09 -06:00
Hengyang Hu
3c694a371b make a centralized master_event func, replace the hardcoded ones across the codebase (#36221) 2016-09-12 09:22:20 -06:00
Nicole Thomas
2b588e3d2f Versionadded should be Nitrogen instead of 2016.3.0 (#36231) 
Refs #36207
 2016-09-12 09:17:26 -06:00
Olivier Mauras
1c2c041d0d Feature: Add Alpine Linux support (#36207) 
* salt/modules/gentoo_service.py: Work also for Alpine which uses OpenRC as well

* salt/modules/apk.py: Add main pkg function for Alpine Linux

* salt/modules/apk.py: Fix list_upgrades

* salt/modules/apk.py: Remove opkg occurences

* salt/modules/apk.py: Return 'Not available' instead of True for unavailable functions

* salt/modules/apk.py: Comment the unavailable functions

* salt/modules/apk.py: Implement pkg.latest_version

* salt/modules/apk.py: Some more spaces between functions

* salt/modules/apk.py: Include release version in pkg_version  returned by pkg.list_pkgs to prevent missing packages returned on pkg.upgrade

* salt/modules/apk.py: Fix lint errors
 2016-09-12 09:14:44 -06:00
boltronics
559a82d678 Command logging output fixes (#36103) 
* Improve command logging by stripping whitespace

The YAML ">" block scalar modifier introduces a trailing new line
character, which breaks up the command output formatting. This can
result in ERROR lines being harder to spot if among broken INFO lines.

* Improve state info log output
 2016-09-12 09:04:42 -06:00
Erik Johnson
b0ddd6dbba Refspec customization (#36216) 
* Added refspec customization to git.latest

* Add documentation for new refspec params to git.latest
 2016-09-12 09:01:16 -06:00
Mike Place
f755e6d890 Fire an event on the master when a refresh occurs (#36219) 
Closes #31465
 2016-09-12 08:46:33 -06:00
Mike Place
1b12940a1f Docs clarification for module sync and state.apply (#36217) 
Closes #35340
 2016-09-12 08:42:12 -06:00
Erik Johnson
b83c0b9238 salt.utils.gitfs: Fix ref to self.root (#36215) 
This regressed during a recent merge-forward. See here for more info:

https://github.com/saltstack/salt/commit/2b1ad9e#diff-2c34a66e40db8ce28e251f98de56ce31L406

Resolves #36095.
 2016-09-12 08:39:22 -06:00
Mike Place
e7e7aaa0a8 Catch instance where docker daemon might not be running 2016-09-12 20:07:31 +09:00
Mike Place
5b7e847998 Merge pull request #36218 from cachedout/minor_comment_fixup 
Fix minor comment issue
 2016-09-12 09:47:24 +09:00
Mike Place
d76d913445 Fix minor comment issue 2016-09-12 09:46:50 +09:00
Mike Place
5a7a72346a Merge pull request #36202 from hu-dabao/add-36049 
for 36049, log current connected master and make status module more useful and efficient
 2016-09-12 08:18:24 +09:00
Mike Place
5ddf0af23e Merge pull request #36166 from jfindlay/parallels 
modules.parallels.delete: allow multiple IDs for same name
 2016-09-12 08:00:56 +09:00
Mike Place
f652fde5ce Merge pull request #36211 from m03/add-initial-win_pki-unit-tests 
Add win_pki unit tests
 2016-09-12 07:59:52 +09:00
Mike Place
6ebe655e17 Merge pull request #36184 from DSRCorporation/bugs/35480_master_shutdown 
Disable signal handling while handling signal
 2016-09-12 07:59:08 +09:00
Mike Place
4e9490eebe Merge pull request #36214 from vutny/postgres-extension-doc 
`postgres_extension` state module: fix docstrings
 2016-09-12 07:58:29 +09:00
Denys Havrysh
5fe548f043 postgres_extension state module: fix docstrings 2016-09-11 23:17:40 +03:00
Mike Place
1eb67df61e Merge pull request #36198 from gtmanfred/carbon 
add keystone state integration tests
 2016-09-11 18:16:38 +09:00
Mike Place
f11f093f8c Merge pull request #36203 from xiaoanyunfei/logowner 
fix owner of MultiprocessingLoggingQueue
 2016-09-11 18:15:15 +09:00
Mike Place
5b7b96c0b7 Merge pull request #36205 from vutny/postgres-tablespace-doc 
Add missing `maintenance_db` kwarg to `postgres_tablespace.present` doc
 2016-09-11 18:14:14 +09:00
mwinnett
b9a98f551e Add win_pki unit tests 2016-09-10 23:31:08 -07:00
Joao Vieira
59e81bc877 Fixes routes being installed with wrong interfaces 
Routes that get installed for a given interface should only get executed
when that interface is coming up/down and not when other interfaces are
starting or stopping. This should fix #36208.
 2016-09-11 00:49:28 +01:00
Denys Havrysh
78296b90d8 Add missing maintenance_db kwarg to postgres_tablespace.present docstring 2016-09-10 12:20:40 +03:00
xiaoanyunfei
74dc90c7bb cancle pr last 2016-09-10 10:04:22 +08:00
xiaoanyunfei
90e4a25dd0 Merge branch 'logowner' of https://github.com/xiaoanyunfei/salt into logowner 2016-09-10 10:02:00 +08:00
xiaoanyunfei
ffd87b2f2f fix logqueue owner 2016-09-10 09:57:29 +08:00
xiaofei.sun
bd61b88fc8 fix log owner 2016-09-10 09:37:53 +08:00
xiaofei.sun
58160ed6c0 Merge branch '2016.3' of github.com:saltstack/salt into 2016.3 2016-09-10 09:06:21 +08:00
Hengyang Hu
5f339356cf for 36049, log current connected master and make status module more useful and efficient 2016-09-09 17:22:50 -07:00
Mike Place
7d25344574 Merge pull request #36194 from jfindlay/mac_timezone 
skip some mac_timezone tests
 2016-09-10 09:07:07 +09:00
Mike Place
81fb34ecd0 Merge pull request #36190 from eradman/openbsdpkg 
pkg.install: enable OpenBSD branch and flavor specifications
 2016-09-10 09:06:43 +09:00
Mike Place
b504d07006 Merge pull request #36196 from twangboy/mac_brew_tests 
Fix test_latest_version test
 2016-09-10 09:03:57 +09:00
Christophe Drevet
4c422f1549 fix cron.absent by identifier on test mode (#36181) 2016-09-09 16:20:58 -06:00
Daniel Wallace
1c31d5e464 add keystone state integration tests 
fix api_version for using connection_args
 2016-09-09 17:14:44 -05:00
twangboy
075ceb09ab Fix test_latest_version test 2016-09-09 14:14:51 -06:00
Thomas S Hatch
b586ed75bd if the backend stack traces when it should return an empty string (#36193) 2016-09-09 13:14:36 -06:00
Nicole Thomas
65eb13d918 Merge pull request #36189 from rallytime/merge-develop 
[develop] Merge forward from carbon to develop
 2016-09-09 12:59:38 -06:00
Nicole Thomas
f035121291 Merge pull request #36188 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-09-09 12:59:20 -06:00
Megan Wilhite
393bbef63b Add test 35015 (#35945) 
* add salt-key eauth tests

* add salt-run with eauth tests

* add method docs

* change expected return
 2016-09-09 12:58:50 -06:00
Justin Findlay
eaada10e89 skip some mac_timezone tests 2016-09-09 12:34:24 -06:00
Nicole Thomas
846f940fd2 Merge pull request #36186 from rallytime/merge-carbon 
[carbon] Merge forward from 2016.3 to carbon
 2016-09-09 11:29:19 -06:00
Nicole Thomas
6a5f7cb346 Ignore states that do not have a numeric jid, i.e. 'req' (#36185) 2016-09-09 11:28:48 -06:00
rallytime
167fe00e00 Merge branch 'carbon' into 'develop' 
No conflicts.
 2016-09-09 09:54:17 -06:00
rallytime
521a7b2470 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/cloud/clouds/opennebula.py
 2016-09-09 09:53:02 -06:00