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,882 Commits 24 Branches 182 Tags 341 MiB
098cf87a6b
Commit Graph

73882 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Eric Radman
16e46e36d9 pkg.install: enable OpenBSD branch and flavor specifications 
Support OpenBSD branch specification (%)

  ruby%2.3

As well as flavor specification (--)

  vim--gtk2

By default packages are installed using the base flavor and the stable
branch.

Also add unit tests for OpenBSD package management
 2016-09-09 11:42:10 -04:00
rallytime
3ed6190ece Merge branch '2016.3' into 'carbon' 
Conflicts:
  - salt/minion.py
 2016-09-09 09:36:57 -06:00
t2b
d4628f3c6b Allow additional kwargs in states.dockerng.image_present (#36156) 
Fixes #31513
 2016-09-09 09:32:38 -06:00
Patrick Valenzuela
b2f1d36e2f Update boto_dynamodb for GSI management and backups (#35878) 
* Update boto_dynamodb state/module for GSI management

* fix trailing whitespace

* modify format strings to conform to file style

* fix lint errors

* fix all but 1 test

* add example
 2016-09-09 08:57:29 -06:00
twangboy
28442b32f8 Fix some lint 2016-09-09 08:47:51 -06:00
Dmitry Kuzmenko
229504efef Removed unused import. 2016-09-09 15:29:03 +03:00
Dmitry Kuzmenko
ca8eb7e076 Don't run the same signal handler twice. Catch os.kill errors. 
Else a Process Not Found error stops the killing loop and there are
still alive master subprocesses.
 2016-09-09 15:27:20 +03:00
Mike Place
1d5f97d36b Merge pull request #35907 from rallytime/fix-35819 
Catch CommandExecutionError when the group in group_installed doesn't exist
 2016-09-09 19:14:16 +09:00
Mike Place
e1bb2663ba Merge pull request #35985 from DSRCorporation/bugs/35945_salt-key_print_errors_to_stdout 
Print errors to stdout in salt-key as it's done in salt and salt-run.
 2016-09-09 19:03:32 +09:00
Mike Place
40127b6bf3 Merge pull request #36068 from rallytime/fix-35972 
Remove grains type deprecation warning from 2016.3
 2016-09-09 19:00:50 +09:00
Mike Place
d7c012cbd0 Merge pull request #36104 from Cidan/develop 
WIP for GCE salt cloud volume support.
 2016-09-09 19:00:23 +09:00
Mike Place
31b2ef2585 Merge pull request #36124 from twangboy/linux_acl_test_mac 
Skip test on all OS's but linux
 2016-09-09 18:59:35 +09:00
Mike Place
8f609a5799 Merge pull request #36126 from edlane/develop 
Add keepalives to salt-master created connections for better presence
 2016-09-09 18:50:51 +09:00
Mike Place
0e84fc888d Merge pull request #36151 from eyj/req-fix 
Ignore states that do not have a numeric jid, i.e. 'req'
 2016-09-09 18:49:54 +09:00
Mike Place
afd0eb8f18 Merge pull request #36160 from terminalmage/fix-nested-indent 
Allow for nested outputter to accept base indentation level as a kwarg
 2016-09-09 18:46:11 +09:00
Mike Place
a0665a431d Merge pull request #36175 from plastikos/cleanup-redundant_key_write 
[TRIVIAL] Remove redundant write of public key.
 2016-09-09 18:43:24 +09:00
Mike Place
24bd03734d Merge pull request #36152 from cachedout/issue_36094 
Remove unnecessary unpack
 2016-09-09 18:13:46 +09:00
Nicole Thomas
817cd9f42a Merge pull request #36177 from rallytime/merge-develop 
[develop] Merge forward from carbon to develop
 2016-09-08 22:43:22 -06:00
rallytime
2edfef33ae Merge branch 'carbon' into 'develop' 
Conflicts:
  - salt/scripts.py
  - salt/thorium/key.py
  - tests/unit/cloud/clouds/dimensiondata_test.py
  - tests/unit/cloud/clouds/gce_test.py
 2016-09-08 17:31:29 -06:00
Nicole Thomas
f82c91dbd4 Merge pull request #36174 from rallytime/merge-carbon 
[carbon] Merge forward from 2016.3 to carbon
 2016-09-08 17:28:35 -06:00
rallytime
c30f697dfd Pylint fix 2016-09-08 17:23:15 -06:00
twangboy
1c83b37fe6 Fix unquoted integers 2016-09-08 17:07:28 -06:00
twangboy
345cd7f9c1 Fix test_launchctl test 2016-09-08 16:30:35 -06:00
Thayne Harbaugh
5e6444b732 Remove redundant write of public key. 2016-09-08 16:26:39 -06:00
rallytime
6da0fbbe96 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - salt/modules/cmdmod.py
  - salt/modules/linux_sysctl.py
  - tests/unit/cloud/clouds/dimensiondata_test.py
  - tests/unit/cloud/clouds/gce_test.py
  - tests/unit/modules/boto_iot_test.py
  - tests/unit/modules/mount_test.py
  - tests/unit/states/boto_iot_test.py
  - tests/unit/utils/network.py
 2016-09-08 16:14:04 -06:00
Nicole Thomas
dc3a68ed8c Merge pull request #36158 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-09-08 15:53:49 -06:00
Joseph Hall
1a7996125a Fix breakage from updates to __utils__ (#36168) 2016-09-08 15:49:45 -06:00