valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
73,757 Commits 24 Branches 182 Tags 341 MiB
087af91dcb
Commit Graph

73757 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
087af91dcb Merge pull request #36294 from rallytime/merge-develop 
[develop] Merge forward from carbon to develop
 2016-09-15 00:19:31 +09:00
rallytime
fb994ad92f Merge branch 'carbon' into 'develop' 
No conflicts.
 2016-09-14 09:00:05 -06:00
Mike Place
33dcfda715 Merge pull request #36288 from cachedout/fix_schema_test 
Schema test requires jsonschema 2.5.0 or above
 2016-09-14 19:04:01 +09:00
Mike Place
1357244ef9 Schema test requires jsonschema 2.5.0 or above 2016-09-14 19:03:13 +09:00
Mike Place
b68ebd8e94 Merge pull request #36226 from cachedout/docker_client 
Catch instance where docker daemon might not be running
 2016-09-14 18:23:17 +09:00
Mike Place
3b81c37a53 Merge pull request #36286 from cachedout/fix_group_test 
Fix pkg group test by passing a list instead of str
 2016-09-14 16:51:08 +09:00
Mike Place
dde623bfd5 Fix pkg group test by passing a list instead of str 
Refs  integration.states.pkg.PkgTest.test_group_installed_handle_missing_package_group
 2016-09-14 15:43:39 +09:00
Mike Place
6a76a3a7e0 Merge pull request #36265 from rallytime/merge-carbon 
[carbon] Merge forward from 2016.3 to carbon
 2016-09-14 14:32:15 +09:00
Mike Place
ad0326e4d7 Merge pull request #36266 from rallytime/merge-develop 
[develop] Merge forward from carbon to develop
 2016-09-14 14:29:13 +09:00
Mike Place
073b88eb5a Merge pull request #36261 from DSRCorporation/bugs/36081_salt-key_output_fix 
Fixed the changed salt-key output on accept/reject/delete actions.
 2016-09-14 14:28:28 +09:00
Mike Place
6d0a996891 Merge pull request #36267 from rallytime/bp-36257 
Back-port #36257 to carbon
 2016-09-14 14:26:54 +09:00
Mike Place
8119eb6a41 Merge pull request #36269 from gtmanfred/carbon 
begin adding tests for the openstack cloud provider
 2016-09-14 14:24:42 +09:00
Mike Place
295d58b46a Merge pull request #36276 from rallytime/test-35388 
Add unit tests for salt.cache.localfs.py
 2016-09-14 14:23:21 +09:00
Mike Place
64fdefafa9 Merge pull request #36283 from rallytime/avahi-beacon-stacktrace 
Protect the dbus import for a loader stacktrace in avahi_announce beacon
 2016-09-14 14:22:02 +09:00
Mike Place
5db74144b8 Merge pull request #36282 from terminalmage/fix-fileserver-test 
Fix for new integration test for fileserver.clear_file_list_cache
 2016-09-14 14:21:41 +09:00
rallytime
d18a37a03a Protect the dbus import for a loader stacktrace in avahi_announce beacon 2016-09-13 15:21:16 -06:00
Erik Johnson
fd28ca058f Fix for new integration test for fileserver.clear_file_list_cache 
The test suite actually has a ``prod`` env, but this test only considers
the ``base`` env. If a test is run which requests a file (or just the
file/dir/symlink/... list) from the ``prod`` env, then this will result
in the ``prod`` env's file list caches being present, and they will be
removed when the ``fileserver.clear_file_list_cache`` runner is
executed, showing up in the return data and causing the test to fail.

This tweak to the test ensures that we will always have a file list
cache for ``prod`` present, and adjusts the necessary asserts in the
test to expect the ``prod`` env in the return data from the runner.
 2016-09-13 15:55:51 -05:00
rallytime
57d8bd36ee Pylint fix 2016-09-13 13:27:46 -06:00
rallytime
faa27a82fa Pass the key kwarg through to the flush function 2016-09-13 11:08:43 -06:00
rallytime
1e9806950d Clean up imports in salt/cache/__init__.py 
the 'os' import is not used, and splitting them out into python vs. salt
imports makes them easier to read and more consistent with other salt files
 2016-09-13 11:03:47 -06:00
rallytime
387ed8bb9f Add unit tests for salt.cache.localfs.py 2016-09-13 10:52:15 -06:00
Daniel Wallace
2d716131da Add test to check openstack in libcloud 
With apache-libcloud 0.20.0
 2016-09-13 10:25:43 -05:00
Daniel Wallace
b488cf2420 add __main__ function for keystone test 2016-09-13 10:23:04 -05:00
Mike Place
3588ceeb10 Have proxy sublcass new minionmanager 
Otherwise the event bus won't be initialized at all.

Refs #33664.

Closes #36173
 2016-09-13 08:27:31 -06:00
rallytime
e385f55588 Merge branch 'carbon' into 'develop' 
No conflicts.
 2016-09-13 08:25:11 -06:00
rallytime
e6a412dd49 Merge branch '2016.3' into 'carbon' 
No conflicts.
 2016-09-13 08:23:51 -06:00
Dmitry Kuzmenko
411cbb373f Fixed the changed salt-key output on accept/reject/delete actions. 2016-09-13 16:31:40 +03:00
Mike Place
60ef970ce4 Have proxy sublcass new minionmanager (#36257) 
Otherwise the event bus won't be initialized at all.

Refs #33664.

Closes #36173
 2016-09-13 07:13:01 -06:00
Mike Place
de06116075 Merge pull request #35688 from cachedout/issue_33525 
Splat serializer default configs into the serializer kwargs
 2016-09-13 18:21:46 +09:00
Mike Place
4910e8191c Provide fallback for serializers without opts 2016-09-13 17:03:11 +09:00
Mike Place
d9d477ed45 Merge pull request #36025 from cloudflare/CF-FIX-36021 
Potential fix for #36021
 2016-09-13 16:46:41 +09:00
Mike Place
3e2375c829 Merge pull request #36176 from twangboy/mac_service_tests 
Fix test_launchctl test in mac_service
 2016-09-13 16:31:46 +09:00
Mike Place
c997d224b8 Merge pull request #36209 from vieira/once_per_interface 
Fixes routes being installed with wrong interfaces
 2016-09-13 09:57:42 +09:00
Mike Place
3833c9e095 Merge pull request #36247 from terminalmage/issue36150 
Add a runner function to clear fileserver list caches
 2016-09-13 09:17:05 +09:00
Mike Place
5063cd0335 Merge pull request #36248 from Ch3LL/fix_archive_test 
fix archive test to only run on redhat
 2016-09-13 09:15:24 +09:00
Ch3LL
9ede50b451 fix archive test to only run on redhat 2016-09-12 15:43:06 -06:00
Erik Johnson
38e700c977 Reduce fileserver_list_cache_time default to 20 sec 2016-09-12 16:29:10 -05:00
Erik Johnson
b7a1a67828 Improve accuracy of fileserver runner tests 
The tests that return files, symlinks, directories, and empty dirs were
all only testing that the type of the return data was the same as what
was expected. By not testing the content, we overlooked a corner case in
which backends passed into the fileserver as a Python list would not be
handled properly. This has since been fixed in PR #36244, but these
tests will help keep this sort of issue from regressing.
 2016-09-12 16:29:10 -05:00
Erik Johnson
ae973a14fb roots backend: Don't include '.' or '..' in empty_dirs 2016-09-12 16:29:10 -05:00
Erik Johnson
322047a844 Add integration tests for fileserver.clear_file_list_cache 2016-09-12 16:29:10 -05:00
Erik Johnson
d3e9c4c5fb Couple fixes to _gen_back 
1. Wasn't properly handling the backend being passed in as a Python list
2. Didn't work properly in the test suite due to the backend being an
   ImmutableList instead of a list. This is because of how the opts are
   loaded in the test suite, all mutable types are immutable versions of
   themselves from salt.utils.immutabletypes.
 2016-09-12 16:29:10 -05:00
Erik Johnson
6722ad9ecf Add runner function to remove file list caches 2016-09-12 16:29:10 -05:00
Erik Johnson
26c426f22a Add function to remove fileserver list caches to fileserver class 2016-09-12 16:29:09 -05:00
Erik Johnson
37c48472d6 Add documentation for fileserver_list_cache_time 2016-09-12 16:29:09 -05:00
Shane Lee
d9bbba9b24 Add missing documentation for the mac_package module (#36192) 
* Add missing documentation for the mac_package module

* Standardize ID in docstrings
 2016-09-12 11:57:41 -06:00
Tom Williams
e95b55b106 INFRA-3692 - add support for absolute paths to yaml files in makostack ext_pillar module. (#36220) 2016-09-12 11:56:45 -06:00
Shane Lee
019ef1c47c Remove invalid JSON for Mac OS X (#36167) 
* Remove invalid JSON for Mac OS X

* Check for fsevents line and remove
 2016-09-12 11:42:43 -06:00
Daniel Hobley
449c29897c Fix timezones states on OS X (#36183) 
* Fix timezones states on OS X

- This function was missing but required by the timezone states

* Added stand in functions for hwclock on OS X

- This fixes the timezone states which tries to use these functions
 2016-09-12 11:42:26 -06:00
Nicole Thomas
fcbebb40c3 Merge pull request #36235 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-09-12 11:40:42 -06:00
Nicole Thomas
9ce4abefcd Merge pull request #36234 from rallytime/merge-carbon 
[carbon] Merge forward from 2016.3 to carbon
 2016-09-12 11:40:30 -06:00