Commit Graph

66134 Commits

Author SHA1 Message Date
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
Mike Place
95db870325 Merge pull request #31508 from mcalmer/zypper-correct-exit-code-checking
Zypper correct exit code checking
2016-02-26 08:21:23 -07:00
Mike Place
e51126179c Merge pull request #31510 from vutny/debian-raspbian-install-guide
Add installation guide for Raspbian (Debian on Raspberry Pi)
2016-02-26 08:06:57 -07:00
Mike Place
92f8f89218 Merge pull request #31497 from rallytime/remove-timeout-dup
Remove duplicate "timeout" definition in Roster docs
2016-02-26 08:01:30 -07:00
Michael Calmer
66e8f6aa37 restructure the code a bit 2016-02-26 14:29:18 +01:00
Michael Calmer
f5c125de19 remove new lines between zypper command and check result 2016-02-26 14:20:11 +01:00
Denys Havrysh
50f3e072b1 Add instruction how to install salt-minion on Debian Jessie from Stretch 2016-02-26 15:10:37 +02:00
Michael Calmer
1425c6496c use specialized assert functions for tests 2016-02-26 13:54:15 +01:00
Michael Calmer
f266cfdaac test _zypper_check_result() 2016-02-26 13:54:15 +01:00
Michael Calmer
aff6467782 adapt tests to new zypper_check_result() output 2016-02-26 13:54:14 +01:00
Michael Calmer
edad780cdf use _zypper_check_result() 2016-02-26 13:54:14 +01:00
Denys Havrysh
abcd505178 Update Debian installation guide with information about Raspbian 2016-02-26 13:30:22 +02:00
Michael Calmer
7c5d5a2b7a add _zypper_check_result() to raise and error or return stdout 2016-02-26 12:26:11 +01:00
Michael Calmer
a6785ef7a9 check zypper exit code everywhere 2016-02-26 12:26:11 +01:00
Michael Calmer
935b0510c9 add function to check zypper exit codes 2016-02-26 12:26:11 +01:00
Nicole Thomas
9d458bb420 Merge pull request #31498 from Ch3LL/rename_test
rename methods in pkg states test
2016-02-25 16:29:51 -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
Ch3LL
29a53f4353 rename methods in pkg states test 2016-02-26 06:54:01 +09: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
83e6480d20 Remove duplicate "timeout" definition in Roster docs 2016-02-25 14:05:38 -07:00
Nicole Thomas
625da0d261 Merge pull request #31471 from cachedout/issue_31427
Correct issue where duplicate items in grains list during state run will result in duplicate grains
2016-02-25 13:15:20 -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
Mike Place
da001bcb49 Merge pull request #31472 from rallytime/update-contributing-docs
Update contributing docs
2016-02-25 09:05:59 -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
rallytime
5871e4d1e0 Update contributing docs 2016-02-24 15:38:37 -07:00
Mike Place
74c3053c91 Remove debugging 2016-02-24 13:54:56 -07:00
Mike Place
30eb5fccf7 Additional tests, but disable the test for distinct lists, because of a problem with context in test suite 2016-02-24 13:53:49 -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
3d2aec05e5 Check for duplicate grains during list insertion
Insert grains into context so that we can know if we're duplicating during multiple inserts in a state run.

Refs #31427
2016-02-24 11:43:24 -07:00