valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-09 01:36:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
68,645 Commits 24 Branches 182 Tags 341 MiB
a2aae987a6
Commit Graph

68645 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nicole Thomas
d57507dde8 Merge pull request #34679 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-07-14 14:59:45 -06:00
rallytime
0c566dce89 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-07-14 14:06:42 -06:00
Mike Place
3e3e2a997e Typo 2016-07-14 13:50:34 -06:00
Mike Place
78f6251c09 Correct issues with config 2016-07-14 13:48:52 -06:00
Mike Place
c138cc03e3 Configuration settings for IPC buffers 2016-07-14 13:24:23 -06:00
Mike Place
3192e1674b Merge pull request #34676 from cachedout/partial_revert_34644 
Revert "Modify lodaer global test to use populated dunders"
 2016-07-14 12:12:55 -06:00
Mike Place
64a154826a Revert "Modify lodaer global test to use populated dunders" 
This reverts commit f45dbe8508df70ce3f563915318791614449b341.
 2016-07-14 12:11:44 -06:00
Bo Maryniuk
208fd33b48 Add unit test for osmajorrelease grain 2016-07-14 18:05:12 +02:00
Bo Maryniuk
9a6b2175c6 Implement "osmajorrelease" by killing spaghetti 2016-07-14 18:04:59 +02:00
Mike Place
b88c39e1d2 Merge pull request #34605 from gtmanfred/2016.3 
catch error if no dns domains exist
 2016-07-14 09:20:46 -06:00
Mike Place
b3dc6031fe Merge pull request #34557 from jacobweinstock/jboss7_cli-handle-expression-type 
handle jboss cli expression type in the parsing of output
 2016-07-14 09:09:49 -06:00
Mike Place
3b6f1089b2 Merge pull request #34601 from lorengordon/clarify-doc 
Clarifies the proper way to reference states
 2016-07-14 08:20:41 -06:00
Nicole Thomas
a7868c248a Spelling fixes found in sqlite3 pillar docs (#34652) 2016-07-13 18:59:43 -04:00
Nicole Thomas
bc63f25a6f Lint 34644 (#34651) 
* Better error handling for __virtual__ in dockerng module

* Modify lodaer global test to use populated dunders

This prevents a number of errors in the error log and makes for a
more robust test IMHO

* Lint #34644
 2016-07-13 18:58:54 -04:00
Mike Place
50360263c5 Adjust the mine test a little bit to give it a better chance of success (#34647) 2016-07-13 16:51:28 -04:00
Mike Place
8a0209101e Merge pull request #34642 from jtand/mysql_integration_cleanup 
Check that mysqladmin exists before running mysql integration tests
 2016-07-13 12:12:44 -06:00
Daniel Wallace
37b0943539 catch error if no dns domains exist 
For digital ocean.  Fixes #33452
 2016-07-13 12:23:09 -05:00
Bo Maryniuk
fb7542f920 Add option to master config reader on ignoring system exit for wrong configuration 2016-07-13 19:20:27 +02:00
Justin Anderson
dd1559a599 Check that mysqladmin exists before running mysql integration tests. 2016-07-13 11:08:26 -06:00
Bo Maryniuk
abd10b5782 Ignore minion config errors everywhere but the minion itself 2016-07-13 18:46:01 +02:00
Mike Place
3e612c3794 Merge pull request #34618 from jtand/network_integration_fix 
Network state integration test test=True
 2016-07-13 10:30:15 -06:00
Megan Wilhite
f6dfbac5ca add num_cpus grain to freebsd (#34565) 
* add num_cpus grain to freebsd

* fix pylint
 2016-07-13 11:40:09 -04:00
Bo Maryniuk
e5f43e6711 Remove deprecation: BaseException.message deprecated as of 2.6 2016-07-13 13:02:51 +02:00
Elias Probst
9c89470661
Try to create the log directory when not present yet 2016-07-13 11:38:03 +02:00
Bo Maryniuk
23d1031a09 Fix lint: E8302 2016-07-13 10:11:18 +02:00
Justin Anderson
445f8afc69 Fixes failing test on Suse Leap (#34621) 2016-07-12 18:48:06 -04:00
Nicole Thomas
61f5045a0d Merge pull request #34619 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-07-12 17:52:00 -04:00
rallytime
f734afd0b0 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/modules/aptpkg.py
  - tests/integration/__init__.py
 2016-07-12 14:29:35 -06:00
Nicole Thomas
9f123543e5 Merge pull request #34617 from rallytime/merge-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2016-07-12 16:11:40 -04:00
rallytime
3026df346f Merge branch '2015.5' into '2015.8' 
No conflicts.
 2016-07-12 13:27:16 -06:00
Nicole Thomas
b90ae407f9 Add support for edge case when Cmd and Entrypoint can't be blanked (#34593) 2016-07-12 15:18:53 -04:00
Justin Anderson
57df38e685 Update github IP for ssh state integration tests (#34592) 2016-07-12 15:17:41 -04:00
Ken Crowell
12b579c4e3 When sorting list actual_data, make it a list (#34590) 
This at least impacts the `running` state when updating container
with no `volumes_from` to some.
 2016-07-12 15:16:11 -04:00
Nicole Thomas
efc2ab9d68 [2016.3] Avoid salt.utils circular imports when using "from" (#34585) 
Also removes an unused import
 2016-07-12 15:13:26 -04:00
jacobhammons
c8bdfb272d Merge pull request #34616 from jacobhammons/network-settings-mock 
Adds a mock required for the network settings beacon
 2016-07-12 13:09:30 -06:00
Jacob Hammons
5e2ddb5eb0 Adds a mock required for the network settings beacon 2016-07-12 13:08:46 -06:00
Justin Anderson
34bcf9ccfc Changed network state test to use test=True 2016-07-12 12:40:40 -06:00
Nicole Thomas
2e1007254b Avoid circular imports when calling salt.utils functions (#34584) 2016-07-12 13:41:30 -04:00
Justin Anderson
7dd8035c62 Gate docker unit test to check for docker (#34591) 
* Gate docker unit test to check for docker

* Change skipIf to check if docker-py is installed, not version check
 2016-07-12 13:33:31 -04:00
Bo Maryniuk
6b660678fa Use Salt default exit codes instead of hard-coded values 2016-07-12 17:29:04 +02:00
Bo Maryniuk
0c2d3511c9 Exit immediately on configuration error 2016-07-12 17:27:11 +02:00
Bo Maryniuk
c5de6c8c4a Raise an exception on any found wrong configuration file 2016-07-12 17:23:42 +02:00
Bo Maryniuk
575767022b Cover exception handling in the utils.parsers 2016-07-12 17:23:36 +02:00
Bo Maryniuk
2cf696671f Introduce configuration error exception 2016-07-12 17:23:29 +02:00
Loren Gordon
bfe0dd0b8a Clarifies the proper way to reference states 
It seems in some situations, or in some earlier version, using a `/`
to reference sls files in subdirectories did work. However, because
of the inconsistency it caused occasional confusion. This updates the
tutorial to focus on the canonical `.` notation, which always works.
 2016-07-12 07:58:27 -04:00
Justin Anderson
b2616833b0 Some small changes 2016-07-11 14:35:25 -06:00
Nicole Thomas
d8c8b4ac6f Merge pull request #34553 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-07-11 15:36:26 -04:00
Mike Place
5b002e11b4 Merge pull request #34569 from eliasp/2016.3-postgres-doc 
Minor doc fixes for PostgreSQL states
 2016-07-11 08:02:12 -06:00
Elias Probst
221da29ef5
Typo (defaul → default) 2016-07-09 16:02:38 +02:00
Elias Probst
ba3d7c624b
Add code formatting 2016-07-09 16:02:29 +02:00