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
61,461 Commits 24 Branches 182 Tags 341 MiB
9065201761
Commit Graph

5933 Commits

Author SHA1 Message Date
Benjamin Drung
8cada9573f Fix typos of retrieve 2016-04-04 14:27:41 +02:00
Erik Johnson
3e374e7ec6 Merge pull request #32243 from isbm/isbm-zypper-list-installed-ensure-latest 
Ensure latest pkg.info_installed ensure latest
 2016-03-31 11:09:59 -05:00
Bo Maryniuk
73ad8a2bfc Fix lint 2016-03-31 01:55:38 +02:00
twangboy
5ca4ad6675 Fix unit tests for state 2016-03-30 17:12:12 -06:00
twangboy
b26cb76abb Fix unit tests 2016-03-30 16:51:58 -06:00
rallytime
d743f8cc4e Merge branch '2015.5' into '2015.8' 
Conflicts:
  - salt/client/ssh/__init__.py
  - salt/modules/aptpkg.py
  - salt/modules/zypper.py
  - salt/states/pkgrepo.py
 2016-03-30 13:38:38 -06:00
Mike Place
5d08db7c92 Merge pull request #32162 from terminalmage/issue31963 
Properly handle yum/zypper repositories in pkgrepo.managed
 2016-03-30 11:51:05 -06:00
Erik Johnson
5c1bdb812c Fix pkgrepo integration test 
Also re-enabled test on ubuntu 15.10.
 2016-03-30 11:34:55 -05:00
Bo Maryniuk
f07c7ea792 Add lowpkg tests for version comparison 2016-03-30 17:33:24 +02:00
Bo Maryniuk
afdf451d87 Remove tests from the zypper_test that belongs to rpm_test 2016-03-30 17:33:03 +02:00
Nicolas Delaby
c989ae5a7e Merge user defined labels with one carried by the image 2016-03-29 11:50:08 +02:00
Mike Place
5877a19f59 Merge pull request #32186 from rallytime/testing-docs 
Add some "best practices" information to test documentation
 2016-03-28 18:22:48 -06:00
Justin Anderson
bd3942e0fd Fixed pylint error in app_pam_test.py 2016-03-28 17:04:47 -06:00
rallytime
e8658697a6 Pylint fix for integration import 2016-03-28 16:56:22 -06:00
rallytime
40d09c822e Add some "best practices" information to test documentation 
Also clarifies some sections and fixes some broken links.
 2016-03-28 14:23:42 -06:00
rallytime
527bc3e491 Pylint fix 2016-03-28 11:24:45 -06:00
rallytime
e9abd2d420 Merge branch '2015.5' into '2015.8' 
Conflicts:
  - salt/modules/rh_service.py
 2016-03-28 10:51:23 -06:00
Mike Place
6b8b8b51c0 Merge pull request #32154 from Ch3LL/ch3ll_pam_2015.5 
Add integration tests for salt-api using pam eauth
 2016-03-28 10:06:36 -06:00
Ch3LL
ba605b0128 fix more pylint and add ability to close cherrypy engine 2016-03-25 12:06:39 -06:00
rallytime
6886681410 Fix test failures 2016-03-24 16:45:03 -06:00
rallytime
7554d0f42d Merge branch '2015.5' into '2015.8' 
Conflicts:
  - doc/ref/states/include.rst
  - doc/topics/cloud/reactor.rst
  - doc/topics/reactor/index.rst
  - doc/topics/releases/2015.5.10.rst
  - doc/topics/tutorials/states_pt5.rst
  - doc/topics/windows/windows-package-manager.rst
  - salt/config.py
  - salt/modules/state.py
  - salt/states/grains.py
  - tests/integration/modules/sysmod.py
  - tests/unit/states/grains_test.py
 2016-03-24 15:48:00 -06:00
Nicole Thomas
c42014eb54 Merge pull request #32056 from bstevenson/fix-list_absent 
Fix list absent
 2016-03-24 11:35:00 -06:00
Brian Stevenson
1500aae027 set deleted value to list 2016-03-23 13:47:12 -07:00
Brian Stevenson
1dc8f5f289 unit test update 
grain value looks for list in assertion
 2016-03-23 10:50:32 -07:00
Colton Myers
95c08f55e9 Tear out useless unit test 2016-03-22 13:46:06 -06:00
Erik Johnson
1b97e4a3df Improve state module docs, replace references to state.highstate/state.sls with state.apply 
Resolves #32037.
 2016-03-21 22:56:17 -05:00
Nicolas Delaby
e511864a55 Fix ports exposition when protocol is passed. 
fixes #32013
 2016-03-21 10:44:22 +01:00
Nicole Thomas
03e8b72655 Merge pull request #31904 from rallytime/merge-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2016-03-16 11:23:54 -06:00
Mike Place
b068eaa963 Merge pull request #31745 from isbm/isbm-always-minion-errcode-2-fix 
Fix the always-false behavior on checking state
 2016-03-15 17:02:19 -06:00
rallytime
892591a39c More pylint fixes 2016-03-15 15:50:05 -06:00
rallytime
35b2076584 Pylint fixes 2016-03-15 14:55:35 -06:00
rallytime
85e5acd11a Merge #31903 with pylint fix 
Merges #31903
 2016-03-15 14:05:09 -06:00
Erik Johnson
394410e2b0 Add integration test for depends decorator 2016-03-14 22:16:10 -05:00
Ch3LL
2d4dc4da05 add teardown call 2016-03-14 16:45:27 -06:00
Ch3LL
d115878714 fix pylint error 2016-03-14 13:45:59 -06:00
root
4c1ab082b6 add pam salt-api tests 2016-03-14 19:19:06 +00:00
Christophe Drevet-Droguet
dcd6f5a5a9 test for file.apply_template_on_contents 2016-03-11 12:44:26 +01:00
Nicole Thomas
75dfb2ed40 Merge pull request #31797 from Ch3LL/fix_pkginfo_test 
Change pkg name to less for suse pkg.info_installed test
 2016-03-10 12:08:16 -07:00
Ch3LL
910f0d9ffc change pkg name to less for suse 2016-03-10 11:18:44 -07:00
Bo Maryniuk
ee1a002673 Update test case to cover SLE11 and SLE12 2016-03-10 13:26:15 +01:00
Bo Maryniuk
4b134fb2ab Add SLE11 product info snapshot, rename previous 2016-03-10 13:25:53 +01:00
Bo Maryniuk
1882e1c960 Adjust test 2016-03-08 20:08:18 +01:00
Mike Place
826fea6582 Merge pull request #31162 from isbm/isbm-md5-to-sha1 
Remove MD5 digest from everywhere and default to SHA256
 2016-03-07 12:11:36 -07:00
Mike Place
24568b1a5d Merge pull request #31711 from ticosax/fix-port-and-volume-discovery 
[dockerng] Port and Volume comparison should consider Dockerfile
 2016-03-07 11:25:19 -07:00
Mike Place
604eb87e82 Merge pull request #31713 from ticosax/fix-dockerng-networking-container_id 
[dockerng] Fix dockerng.network_present when container is given by name
 2016-03-07 08:14:41 -07:00
Nicolas Delaby
3837cf44ca Fix network_present by dealing with containers ID's instead of names. 
Because docker inspect network returns attached containers by their Ids.
 2016-03-07 10:30:58 +01:00
Nicolas Delaby
cf38691597 Port and Volume comparison should consider Dockerfile 
`EXPOSE` and `VOLUME` declaration of a Dockerfile are exactly like
user declaration those parameters in their sls for dockerng.running

Considering Dockerfile containing this line:

```
EXPOSE 80
```

Those 2 sls are now considered strictly equivalent.

```yaml
container:
    dockerng.running:
      image: alpine
      ports:
        - 80/tcp
```

```yaml
container:
    dockerng.running:
      image: alpine
```
 2016-03-07 10:11:52 +01:00
Matthew Cillo
ba33d75949 passing lint test 2016-03-06 17:19:08 -05:00
rallytime
6559ea15b0 Merge branch '2015.5' into '2015.8' 
Conflicts:
  - doc/glossary.rst
  - salt/config.py
  - tests/unit/modules/gpg_test.py
 2016-03-06 10:59:46 -07:00
Nicole Thomas
d7914cdb14 Merge pull request #31687 from cachedout/rm_gpg_test 
Removed useless GPG tests
 2016-03-04 17:08:27 -07:00