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
66,874 Commits 24 Branches 182 Tags 341 MiB
40cd0ac8fe
Commit Graph

66874 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
320d8279ce Lint #31344 2016-02-22 12:59:25 -07:00
mkuchin
bbe8acba0c Fixes #31343 2016-02-22 12:58:47 -07:00
Mike Place
134c0481a0 Merge pull request #31404 from sjorge/2016.3-fixmdatagrains 
mdata grains missing on 2016.3 and develop when running linux
 2016-02-22 12:39:42 -07:00
Jorge Schrauwen
d09d1291c3 fix typo and improve comment 2016-02-22 19:36:42 +00:00
Mike Place
7d01979898 Merge pull request #31336 from terminalmage/config-validation-logging 
Improve config validation logging
 2016-02-22 12:34:24 -07:00
Mike Place
2bd9af38b0 Merge pull request #31329 from kraney/boto_iam 
Extend boto_iam with support for managed policies
 2016-02-22 12:28:30 -07:00
justinta89
6db628be1a Basic integration tests for beacons execution module 2016-02-22 11:22:34 -07:00
Mike Place
e1ade05e54 Merge pull request #31355 from rallytime/fix-31330 
Fix orchestrate outputter when retcode is appended to orchestrate run
 2016-02-22 11:13:07 -07:00
Mike Place
adac349699 Merge pull request #31379 from sjorge/module-zfs-leftover-log 
salt.module.zfs had leftover log statements
 2016-02-22 11:12:42 -07:00
Erik Johnson
c7bd13c9c9 Merge pull request #31376 from cro/suse_service2 
Some distros don't have a /lib/systemd
 2016-02-22 12:11:39 -06:00
Mike Place
268180f49b Merge pull request #31386 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-02-22 10:43:32 -07:00
Mike Place
0a63aa4fab Merge pull request #31377 from jfindlay/blackout 
add integration tests for minion blackout
 2016-02-22 10:30:34 -07:00
Kris Raney
04b3a24e78 Update unit tests to reflect changes 2016-02-22 10:58:23 -06:00
Mike Place
105821efc7 Merge pull request #31352 from ticosax/pull-image-on-running 
[dockerng] Pull missing images when calling dockerng.running
 2016-02-22 09:54:10 -07:00
Mike Place
83294e4f3a Merge pull request #31378 from mcalmer/zypper-refresh-handling 
Zypper refresh handling
 2016-02-22 09:50:28 -07:00
Mike Place
e24685b89a Merge pull request #31373 from terminalmage/issue31229 
Use --set-upstream instead of --track to set upstream on older git
 2016-02-22 09:46:00 -07:00
Mike Place
343789b456 Merge pull request #31364 from DSRCompany/issues/30183_multimaster_failover_switch 
Don't send REQ while another one is waiting for response.
 2016-02-22 09:45:23 -07:00
Mike Place
d9a5e581dd Merge pull request #31371 from techhat/vault 
Add pillar module for vault
 2016-02-22 09:29:51 -07:00
rallytime
8d928ab34a Pylint fix from wierd git behavior 2016-02-22 09:24:13 -07:00
Mike Place
fed096a29d Merge pull request #31374 from sjorge/solarish_hwaddr 
fix for #31369
 2016-02-22 09:22:21 -07:00
Mike Place
c5790bc4d6 Merge pull request #31390 from abednarik/remove_deprecated_psed_in_lorgotate 
Fix Logrotate module.
 2016-02-22 09:09:15 -07:00
Mike Place
b493a685bb Merge pull request #31396 from rallytime/merge-develop 
[develop] Merge forward from 2016.3 to develop
 2016-02-22 09:07:03 -07:00
Mike Place
6c9881e103 Merge pull request #31401 from nmadhok/patch-1 
Update README.rst
 2016-02-22 09:06:18 -07:00
justinta89
3b238c2e68 Started adding beacons execution module tests 2016-02-22 08:53:02 -07:00
Jorge Schrauwen
ac44e2e259 make the mdata grains work on linux when running in a zone 2016-02-22 13:37:24 +00:00
Anand Nevase
12a0c76448 Updated Windows Fullname and Organization for vmware driver 2016-02-22 18:50:42 +05:30
Jorge Schrauwen
22a64ac9e4 fix virtual grain on SmartOS 2016-02-22 13:13:19 +00:00
Michael Calmer
274e6467be do not change kwargs in refresh while checking a value 2016-02-22 09:51:01 +01:00
Nitin Madhok
4f8b725793 Update README.rst 2016-02-22 01:53:27 -05:00
C. R. Oldham
f3fec5562e We need one more mocked return from listdir. 2016-02-21 21:55:08 -07:00
kstreee
53e0b56b13 [saltstack/salt#31194] Add documentation about running multiple salt-api modules, advised by @whiteinge. 2016-02-22 11:35:16 +09:00
kstreee
cfab276324 [saltstack/salt#31194] Make the code simple because IndexError exception has very rare chance to be raised at 'os.path.abspath(__file__).rsplit('/')[-2]', advised by @whiteinge. 2016-02-22 09:51:54 +09:00
C. R. Oldham
ab9d9e7008 Can't add a tuple and a string. 2016-02-21 17:09:12 -07:00
rallytime
38f89bf8fd Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/beacons/inotify.py
  - salt/beacons/load.py
 2016-02-21 15:23:24 -07:00
Michael Calmer
644b14c273 simplify checking the refresh paramater 2016-02-21 11:26:51 +01:00
Erik Johnson
28f0a75cc1 Use --set-upstream instead of --track to set upstream on older git 
This pull request also adds some DRY logic to reduce code duplication,
adds an additional comment to the state return data in the event that
git.checkout was run, and fixes a minor logging inaccuracy (a
str.format() placeholder was used in a string but that string did not
call .format(), so the placeholder was being logged).

Other changes:

* If a new branch needs to be checked out, a hard reset to remote_rev was
  unnecessarily being performed afterwards. This had no functional effect
  since the act of checking out the new branch will place HEAD at
  remote_rev, but the reset was still redundant.

* Also, when a new branch is being checked out, the tracking branch was
  being unnecessarily set, since the act of checking out the branch would
  setup the tracking branch if the rev being checked out is a branch.

Fixes #31229.
 2016-02-20 21:52:46 -06:00
Simon Gomizelj
963e12ddc2 Add missing nftables families 
The inet family a special hybrid ipv4+ipv6 table, netdev for filtering
from ingress.
 2016-02-20 21:32:48 -05:00
Simon Gomizelj
c0ac0c0096 Fix check_table 
The output of 'nft list tables' has the family included in the output
 2016-02-20 21:32:48 -05:00
Brendan McGrath
91e74feaf3 Added sanity check: is 'pillar' in self.opts 
This fixes an exception that is thrown when using the 'when' clause in a
master scheduler. The master does not appear to create a 'pillar' entry
in self.opts
 2016-02-21 12:53:47 +11:00
abednarik
c1e0ff7785 Fix Logrotate module. 
There is an issue reported #31137 where current logrotate module
create a .bak file, when using it. This will break logrotate since .bak
file will be left in /etc/logrotate.d directory.
At the same time and as a consecuence of fixing this, file.psed was
replace with file.replace since psed is deprecated since long time.

Fixes #31137.
 2016-02-20 22:14:06 -03:00
Mathieu Le Marec - Pasquet
e3e97a43ce Bring up ext_pillar rendering errors as well 2016-02-20 21:25:52 +01:00
Ilia G Akilov
1f8276f2be minor bug fix, function name replaced with the call 2016-02-20 14:50:57 -05:00
rallytime
4baea26c58 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - doc/topics/netapi/index.rst
  - salt/modules/win_servermanager.py
  - salt/modules/zypper.py
 2016-02-20 12:27:41 -07:00
Dmitry Kuzmenko
a60522daf8 Set auth retry count to 0 if multimaster mode is failover 2016-02-20 17:44:12 +03:00
Dmitry Kuzmenko
950098cf9c Don't send REQ while another one is waiting for response. 
The message has to be removed from the queue the only *after* it's
already processed to don't confuse send() functionality that expects
empty queue means: there's no active sendings.
 2016-02-20 17:39:25 +03:00
Jorge Schrauwen
05ec1d8ce3 remove left over debug logging 2016-02-20 11:00:07 +00:00
Michael Calmer
db0e0de2fd add refresh option to more functions 2016-02-20 11:48:48 +01:00
Michael Calmer
5836be3f59 unify behavior of refresh 2016-02-20 11:48:48 +01:00
Mike Place
174ee10fc2 Merge pull request #31354 from ticosax/dont-require-auth-for-all-registries 
[dockerng] Dont require auth for all registries
 2016-02-19 22:45:10 -07:00
Mike Place
87032995ed Merge pull request #31372 from jfindlay/process_log 
utils.process: reduce log level
 2016-02-19 22:44:11 -07:00