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
79,441 Commits 24 Branches 182 Tags 341 MiB
6487953b36
Commit Graph

79441 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
6487953b36 Merge pull request #39898 from thatch45/catch_race 
Catch a race condition...
 2017-03-15 13:45:33 -06:00
Mike Place
5734e2b0a8 Merge pull request #40027 from terminalmage/py3-tests 
Update git state integration tests for PY3 compatibility
 2017-03-15 13:40:55 -06:00
Mike Place
25b5ca9fc4 Merge pull request #40029 from twangboy/win_pkg_py3 
Make pkg execution/state modules work on Py3 on Windows
 2017-03-15 13:37:34 -06:00
Mike Place
1936474b25 Merge pull request #40056 from thatch45/develop 
update mention bot blacklist
 2017-03-15 13:28:26 -06:00
Thomas S Hatch
95d8cd5466 syntax 2017-03-15 13:27:54 -06:00
Thomas S Hatch
713ff18d5a update mention bot blacklist 2017-03-15 13:26:13 -06:00
Nicole Thomas
04e4bed82c Merge pull request #40046 from gtmanfred/develop 
fix some incorrect documents
 2017-03-15 11:47:13 -06:00
Nicole Thomas
ad9878fa51 Merge pull request #40026 from rallytime/flaky-decorator 
Add flaky decorator to flaky rest_tornado test
 2017-03-15 09:19:47 -06:00
Daniel Wallace
da6d88a58a fix some incorrect documents 2017-03-15 10:06:03 -05:00
Nicole Thomas
a84a43db00 Merge pull request #40000 from skizunov/develop2 
Fix exception in salt-call when master_type is 'disable'
 2017-03-15 09:05:18 -06:00
twangboy
1d4d8bce17 Make pkg module/execution module work on Py3 2017-03-14 23:44:40 +00:00
Nicole Thomas
f5d4334178 Merge pull request #39865 from cetanu/patch-2 
Check if vm_name is splittable before altering
 2017-03-14 17:16:01 -06:00
Erik Johnson
ef110baa99 Update git state integration tests for PY3 compatibility 
Python 3 didn't like some of the stuff that we were doing with
``subprocess.check_call()`` in these tests, so to fix this I have redone
that stuff with calls to functions in the git execution module. In order
to avoid problems with running tests with no global gitconfig, I needed
to add an argument called ``git_opts`` to most of the funcs in the git
execution module (well I didn't *need* to do it to most of the funcs, it
just seemed like we shouldn't only be supporting this argument in a
single function).

This new ``git_opts`` argument is specifically for passing arguments to
the git command itself (not the subcommand). For example, ``git -c
user.name="Foo Bar" commit .....`` is different than running ``git
commit -c user.name="Foo Bar" .....``, because the ``commit`` subcommand
for git also accepts ``-c``.
 2017-03-14 18:07:06 -05:00
Nicole Thomas
3de5280587 Merge pull request #40024 from rallytime/merge-develop 
[develop] Merge forward from 2016.11 to develop
 2017-03-14 17:00:51 -06:00
Nicole Thomas
dfa304b098 Remove whitespace 2017-03-14 16:33:03 -06:00
rallytime
fe4a208569 Add flaky decorator to flaky rest_tornado test 2017-03-14 16:30:54 -06:00
Nicole Thomas
08d6b96171 Merge pull request #39977 from bodhi-space/infra4506 
INFRA-4506 - various fixes as detailed below
 2017-03-14 15:52:32 -06:00
rallytime
4b0bdc9ce0 Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/modules/s3.py
 2017-03-14 15:39:51 -06:00
Mike Place
8db74fb275 Merge pull request #40020 from dmurphy18/aix_timezone 
Full support for execution module timezone on AIX
 2017-03-14 15:05:30 -06:00
Mike Place
60066da614 Merge pull request #39924 from dmurphy18/salt_aix_fixMar 
Add AIX support for user and group execution modules
 2017-03-14 15:04:01 -06:00
Tom Williams
20e80dab65 Merge pull request #1 from rallytime/pr-39977 
Fixup failing unit test for tests.unit.states.test_boto_asg.py file
 2017-03-14 16:29:10 -04:00
rallytime
f6cd372358 Update boto_asg state file unit test mocks to account for changes in #3997 2017-03-14 14:05:20 -06:00
Mike Place
4cfa659eae Merge pull request #40012 from mprenditore/develop 
added certname paramater
 2017-03-14 13:48:49 -06:00
Mike Place
51fb191157 Merge pull request #39841 from rafaelcaricio/telegram-beacon 
Telegram beacon
 2017-03-14 13:30:37 -06:00
rallytime
12bf5bc7f8 Pylint fix 2017-03-14 13:04:51 -06:00
Mike Place
cd73eafec8 Merge pull request #40010 from jettero/s3-bucket-path-broken 
S3 bucket path broken
 2017-03-14 13:01:00 -06:00
Mike Place
14e4392da5 Merge pull request #39886 from Mapel88/develop 
Additional functions for win_iis module & state
 2017-03-14 12:56:18 -06:00
Mike Place
9495664f0f Merge pull request #40002 from s0undt3ch/features/py3 
Minor Py3 test module fix
 2017-03-14 12:44:36 -06:00
Mike Place
87237a83ab Merge pull request #40019 from rallytime/39888-followup 
Fixup some documentation references for new grain.equals function
 2017-03-14 12:38:47 -06:00
Stefano Stella
03d762d77f moved 'certname' to avoid API change 2017-03-14 19:13:19 +01:00
Nicole Thomas
c14c46afde Merge pull request #40014 from bodhi-space/develop 
Extra tiny fix for undefined var in rarely used code path....
 2017-03-14 12:08:34 -06:00
rallytime
dbdc8cba97 Fixup some documentation references for new grain.equals function 
- versionadded
- code-block notation
 2017-03-14 11:38:45 -06:00
Nicole Thomas
dd2bcb7c26 Merge pull request #39888 from ni3mm4nd/module_grains 
Add function for matching key/value grains
 2017-03-14 11:36:40 -06:00
Nicole Thomas
bc49a4a8c5 Merge pull request #39997 from techhat/filterevents 
Add event_filter to salt cloud
 2017-03-14 11:24:23 -06:00
Nicole Thomas
42361596e9 Merge pull request #40009 from gtmanfred/develop 
Use linux_distribution from distro if not in platform
 2017-03-14 11:18:35 -06:00
Nicole Thomas
2714676a13 Merge pull request #39746 from terminalmage/pathutils 
Add salt.utils.path
 2017-03-14 11:00:34 -06:00
David Murphy
aabbbffd45 Full support to execution module timezone on AIX 2017-03-14 11:00:14 -06:00
David Murphy
16d5c7ce4a WIP: timezone support for AIX 2017-03-14 11:00:14 -06:00
Stefano Stella
a53ab72f5e Merge remote-tracking branch 'upstream/develop' into develop 2017-03-14 17:33:02 +01:00
Stefano Stella
d86c94820a added certname even in the acme state 2017-03-14 17:32:34 +01:00
Nicole Thomas
350edbe7e6 Remove unused import in test_core.py 2017-03-14 10:28:42 -06:00
Nicole Thomas
9aca990c97 Merge pull request #40001 from jmickle/develop 
updating documentation typos
 2017-03-14 10:25:41 -06:00
Mapel88
b31d1377ab Update win_iis.py 
added 'r'
 2017-03-14 18:24:52 +02:00
Nicole Thomas
656a26fa3c Merge pull request #39990 from cloudflare/fix-39983 
Cache the napalm object and fetched grains separately
 2017-03-14 10:19:52 -06:00
Jan Kadlec
a797a58ee6 Change function name to equals 2017-03-14 17:15:52 +01:00
Stefano Stella
ce57daaa29 Merge remote-tracking branch 'upstream/develop' into develop 2017-03-14 17:04:24 +01:00
Joseph Hall
367701c136 Lint 2017-03-14 10:04:10 -06:00
Nicole Thomas
61f1fb04c5 Merge pull request #39991 from terminalmage/source_hash-docs 
Document the fact that the checksum type can be omitted in file.managed states
 2017-03-14 09:58:10 -06:00
Tom Williams
6bf38920a7 Extra tiny fix for undefined var in rarely used code path.... 2017-03-14 11:45:34 -04:00
Erik Johnson
c09f8e283c Add httpretty to py34 dev requirements 
httpretty Needs to be here for now even though it's a dependency of
boto. A pip install on a fresh system will decide to target httpretty
0.8.10 to satisfy other requirements, and httpretty 0.8.10 has bugs in
setup.py that prevent it from being successfully installed (at least on
Python 3.4).
 2017-03-14 10:29:19 -05:00