valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
66,017 Commits 24 Branches 182 Tags 341 MiB
df10355ac9
Commit Graph

66017 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joseph Hall
df10355ac9 Ensure that the latest node data is returned 2016-03-01 12:32:02 -07:00
Mike Place
a0d8a226f1 Merge pull request #31523 from skizunov/develop2 
Fix 'failover' mode when using salt-call
 2016-02-29 08:02:50 -07:00
Nicole Thomas
9edd79d811 Merge pull request #31519 from jfindlay/launch_virtual 
launchctl, mac_assistive __virtual__: more LooseVersion, use osrelease
 2016-02-26 16:40:59 -07:00
Sergey Kizunov
2cc0231584 Fix 'failover' mode when using salt-call 
'failover' mode, among other things, was intended to be handled in
`SMinion.__init__`. Unfortunately, the original code simply had:

`self.eval_master(self.opts, failed=True)`

This will do nothing, since `self.eval_master` will return a future
and nothing actually runs that future (it isn't added to any IO loop,
just discarded). Now we synchronously invoke that future to make sure
that this logic is executed before code flow continues.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
 2016-02-26 16:43:21 -06:00
Justin Findlay
afb96e9dcb states.mac_assistive.__virtual__: use osrelease 2016-02-26 13:51:36 -07:00
Justin Findlay
22f6e5daab modules.mac_assistive.__virtual__: use osrelease 2016-02-26 13:50:50 -07:00
Justin Findlay
e5e4995644 modules.launchctl.__virtual__: more LooseVersion 2016-02-26 13:47:35 -07:00
Mike Place
45d840845d Merge pull request #31514 from rallytime/bp-31279 
Back-port #31279 to 2016.3
 2016-02-26 10:24:22 -07:00
Daniel Wallace
f2040f88ef add pillars to extmods sync_all commands 
So that we can use _pillar from the fileserver
 2016-02-26 09:35:53 -07:00
Nicole Thomas
2ede32aaf8 Merge pull request #31493 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-02-25 15:52:25 -07:00
rallytime
a41ce26287 Actually mock cmd.run_all call... 2016-02-25 15:11:25 -07:00
rallytime
e8f5f9b67a Fix zypper_test: Zypper function uses cmd.run_all, not cmd.run in 2016.3 2016-02-25 14:23:36 -07:00
rallytime
03fd26dcaa Pylint fix with correct refactor from removing 'action' in zypper module 2016-02-25 13:07:57 -07:00
rallytime
3b74d123af Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/modules/selinux.py
  - salt/modules/zypper.py
  - salt/pillar/__init__.py
  - salt/states/dockerng.py
  - tests/runtests.py
 2016-02-25 12:36:22 -07:00
Nicole Thomas
e85ae2341a Merge pull request #31455 from ticosax/diable-NOTSET-check 
[dockerng] Disable notset check
 2016-02-25 12:15:09 -07:00
Mike Place
e68a0947b7 Merge pull request #31488 from isbm/isbm-zypper-ut-removepurge 
Unit Test for Zypper's "remove" and "purge"
 2016-02-25 10:52:33 -07:00
Nicolas Delaby
e072937243 dockerd returns sometimes None or [] for ports. 2016-02-25 18:18:59 +01:00
Nicole Thomas
cd87760c87 Merge pull request #31485 from jacobhammons/2015.8 
Fixed transport description in minion / master config
 2016-02-25 10:04:15 -07:00
Bo Maryniuk
d30f2e4627 Implement unit test for remove and purge 2016-02-25 17:48:03 +01:00
Bo Maryniuk
4caf201052 Refactor code (a bit) 2016-02-25 17:48:03 +01:00
Bo Maryniuk
df89da4d15 Fix the docstring 2016-02-25 17:48:03 +01:00
Jacob Hammons
748acab8b5 Fixed zeromq casing in transport settings 2016-02-25 09:38:41 -07:00
Mike Place
fb1ef92e2b Merge pull request #31411 from jtand/beacons_tests 
Added some beacons execution module integration tests
 2016-02-25 09:16:26 -07:00
Jacob Hammons
765a226907 Fixed transport description in minion / master config 2016-02-25 09:08:54 -07:00
Nicole Thomas
2e9a705e75 Merge pull request #31475 from jacobhammons/2015.8 
Assorted doc issues
 2016-02-25 09:03:54 -07:00
Mike Place
3905dd81d3 Merge pull request #31477 from vutny/correct-doc-install-ubuntu 
Correct installation documentation for Ubuntu
 2016-02-25 09:01:38 -07:00
Mike Place
f027dc0cf8 Merge pull request #31479 from isbm/isbm-zypper-unittest 
Zypper unit tests & fixes
 2016-02-25 08:58:15 -07:00
Bo Maryniuk
9f64333ccb Do not use Zypper purge (reason: too dangerous) 2016-02-25 14:00:45 +01:00
Bo Maryniuk
bc05acf7c3 Fix PyLint 2016-02-25 14:00:12 +01:00
Denys Havrysh
172f34a6ca Correct headers in Debian/Ubuntu/SUSE install instructions 2016-02-25 11:51:40 +02:00
Denys Havrysh
4248f9ea0a Add common packages installation section to Debian install guide 2016-02-25 11:04:11 +02:00
Denys Havrysh
8c6e179870 Add note about amd64 packages to Ubuntu install guide 2016-02-25 11:02:07 +02:00
Denys Havrysh
afaa24723a Update Ubuntu install guide: 
- remove duplicate sections
- add `salt-api` and `salt-cloud` to the example
 2016-02-25 10:24:55 +02:00
Jacob Hammons
a72dc15720 Assorted doc issues 
Fixes #10330
Fixes #31216
Fixes #30464
Fixes #29520
Fixes #30261
Fixes #29636
Fixes #29528
 2016-02-24 16:56:52 -07:00
Nicole Thomas
3dba716bba Merge pull request #31460 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-02-24 13:46:14 -07:00
Mike Place
987dd89979 Merge pull request #31445 from rallytime/fix-31366 
Only use LONGSIZE in rpm.info if available. Otherwise, use SIZE.
 2016-02-24 11:35:31 -07:00
Mike Place
979c8b4faa Merge pull request #31464 from Ch3LL/fix_int_test 
integartion test: ensure decorator only runs on one method and not class
 2016-02-24 11:35:00 -07:00
rallytime
3feee46d38 Whitespace 2016-02-24 11:34:29 -07:00
rallytime
2e6f9c4c36 Pylint fix 2016-02-24 11:01:21 -07:00
justinta89
7d32b56015 Added some more checks to verify beacon changes were actually happening 2016-02-24 10:38:23 -07:00
Jacob Hammons
10bf7c3bdd Fixes #31402 
Added arguments to state `file.line` to fix issue where exe module uses `line` and state module uses `name`.
Reformatted parameters in exe module `file.line`
placeholder release notes for 2015.5.8
 2016-02-24 10:30:34 -07:00
Jacob Hammons
d03abe92dc Added note clarifying when dnspython is not required 2016-02-24 10:30:34 -07:00
Nicolas Delaby
049dcce739 handle inconsistencies in dockerd API 2016-02-24 10:30:33 -07:00
Nicolas Delaby
c08ac624be pep8 2016-02-24 10:30:33 -07:00
Michael Calmer
bb07d27b50 fix argument handling for pkg.download 2016-02-24 10:30:33 -07:00
Erik Johnson
f107d1a288 Support running grains tests 2016-02-24 10:28:10 -07:00
Erik Johnson
9da467aec7 Rename core.py to core_test.py 2016-02-24 10:15:01 -07:00
twangboy
eb35fcf869 Fix version check 2016-02-24 10:15:01 -07:00
Erik Johnson
468c637032 Add unit test for core grains 2016-02-24 10:15:01 -07:00
Erik Johnson
409d4bacdc Fix debian grains setup 
This was broken in 885e00b because the updated regex now removes the
slash in 'Debian GNU/Linux'.

This issue did not make it into an official release, it exists only in
the head of the 2015.8 branch.
 2016-02-24 10:15:01 -07:00