valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
69,413 Commits 24 Branches 182 Tags 341 MiB
833beb9b36
Commit Graph

69413 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Clint Armstrong
833beb9b36 Merge pull request #1 from terminalmage/pr-36538 
Move check for service availability to a helper function
 2016-09-28 16:42:13 -04:00
Erik Johnson
c4060ba2c1 Move check for service availability to a helper function 
This allows for us to check for unit file changes at the beginning of
the available() function without invoking the available() function a
second time, potentially resulting in a recursive loop if not handled
delicately.
 2016-09-28 15:29:25 -05:00
Clint Armstrong
20c2c91bba daemon-reload on call to service.avaliable 2016-09-23 14:45:16 -04:00
Nicole Thomas
55cf4d6a04 Merge pull request #36529 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-09-23 10:42:42 -06:00
rallytime
52cf40db8c Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-09-23 08:32:47 -06:00
Mike Place
03491634ff Merge pull request #36483 from dmurphy18/aix_fix_ipv6 
Isolate sun IPv6 fix to Sun OS only
 2016-09-23 18:24:54 +09:00
Mike Place
1c3758544c Merge pull request #36441 from twangboy/update_setup 
Check for existing libraries on Windows
 2016-09-23 18:20:58 +09:00
Mike Place
654fa8d770 Merge pull request #36280 from jwplayer/feature/2016.3-better-postgresql-grants 
Feature/2016.3 better postgresql grants
 2016-09-23 16:55:32 +09:00
Mike Place
8104d5c92a Merge pull request #36508 from twangboy/fix_chocolatey 
Fix chocolatey
 2016-09-23 16:36:03 +09:00
Mike Place
364f74dfc9 Merge pull request #36519 from terminalmage/docs 
Rewrite minionfs walkthrough
 2016-09-23 14:19:58 +09:00
Erik Johnson
2df51ce3e9 Rewrite minionfs walkthrough 
This walkthrough did not reflect the blacklist/whitelist or mountpoint
features, this commit rewrites it.
 2016-09-22 18:23:32 -05:00
Erik Johnson
cc9d41fb0e Change items in minionfs blacklist/whitelist example 
These were copypasta'ed from gitfs' blacklist/whitelist example, but
they aren't as apropos here because the blacklist/whitelist for minionfs
is meant to refer to minion IDs, not branches/tags like in gitfs.
 2016-09-22 18:22:03 -05:00
David Murphy
b68f982c6a Updated check as per code review 2016-09-22 13:19:47 -06:00
David Murphy
cbcdb472fe Isolate SUN IPv6 fix to Sun Os only 2016-09-22 13:19:47 -06:00
Nicole Thomas
6f54e16cdf Merge pull request #36505 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-09-22 11:37:33 -06:00
twangboy
a7c858d9ab Fix retcodes 2016-09-22 11:18:27 -06:00
twangboy
feadd827a7 Add additional functionality to upgrade 2016-09-22 10:37:55 -06:00
rallytime
5bd4d6430b Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/modules/postgres.py
 2016-09-22 10:03:51 -06:00
Denys Havrysh
bf6195b9a6 postgres_extension state: small corrections in docstrings (#36500) 2016-09-22 08:13:24 -06:00
Mike Place
464c4305f9 Merge pull request #36496 from cachedout/namespace_repr 
Add repr to namespacedict
 2016-09-22 13:34:11 +09:00
Mike Place
b021ea5d40 Merge pull request #36464 from vutny/postgres-tablespace-options 
Fix `options` parameter processing in `postgres_tablespace.present`
 2016-09-22 13:24:04 +09:00
Mike Place
a0f838af36 Merge pull request #36474 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-09-22 13:16:58 +09:00
Mike Place
ec4f4f49ca Merge pull request #36478 from rallytime/fix-36475 
Add the "bash" option to the "code-block"directive.
 2016-09-22 13:15:14 +09:00
Mike Place
4c6e7bf873 Merge pull request #36484 from terminalmage/salt-cloud-tmp-files 
Fix for temp files being left over by salt-cloud execution
 2016-09-22 13:11:58 +09:00
Mike Place
333842c319
Add repr to namespacedict 
This resolved #35813

The problem here was that we would pack __grains__ into modules
using a NamespacedDictWrapper which would normally work fine because
the typical use case was to either retrieve a particular item or to
iterate over the items. However, in cases where we returned the __grains__
dictionary entirely, it would be represented as an empty dictionary.
 2016-09-22 12:24:49 +09:00
twangboy
fb5eb4dc03 Fix retcodes, add upgrade function 2016-09-21 17:35:11 -06:00
David Murphy
9005a87635 Merge pull request #36486 from terminalmage/rebase-docs 
Improve the rebase docs in contributing guidelines
 2016-09-21 13:21:10 -06:00
Erik Johnson
0bf520e089 Ensure temp file is actually removed 
Forgot to add this when I was doing the os.close()
 2016-09-21 14:15:26 -05:00
Erik Johnson
072fd823f7 Use os.write() on file descriptor instead of opening a filehandle 
tempfile.mkstemp() already gives us an OS-level file descriptor, opening
a separate filehandle for this is unnecessary.
 2016-09-21 14:15:21 -05:00
Erik Johnson
f61e8d6366 Fix for temp files being left over by salt-cloud execution 2016-09-21 14:15:13 -05:00
Erik Johnson
4839c325ae Improve the rebase docs in contributing guidelines 
These docs do not tell people how to deal with branch diversions which
happen as a result of a rebase, and could lead (let's be real, probably
_has led_) to users pulling/merging, which will add a buttload of
unrelated commits to their pull request.

This update shows how to force-push when necessary.
 2016-09-21 13:53:27 -05:00
rallytime
7be7d5832f Add the "bash" option to the "code-block"directive. 
Fixes #36475

By adding the "bash" argument, we avoid the following error and the docs
will display appropriately:
```
/root/SaltStack/salt/doc/topics/tutorials/gitfs.rst:918: ERROR: Error in "code-block" directive:
1 argument(s) required, 0 supplied.

.. code-block::

    Cmnd_Alias SALT_GIT_HOOK = /bin/salt-call event.fire_master update salt/fileserver/gitfs/update
    Defaults!SALT_GIT_HOOK !requiretty
    ALL ALL=(root) NOPASSWD: SALT_GIT_HOOK
```
 2016-09-21 10:17:10 -06:00
rallytime
8805b57a1e Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-09-21 09:32:53 -06:00
Mike Place
bc5ac9adae Merge pull request #36455 from twangboy/windows_installation_docs 
Update docs for Windows
 2016-09-21 23:28:28 +09:00
twangboy
ec67a9bb2f Add cachedout's recommendations 2016-09-21 07:39:20 -06:00
Michael Stella
e7a597da00 Bugfix: don't concatenate when not needed 2016-09-21 09:22:25 -04:00
Denys Havrysh
580aed87b9 Fix options parameter processing in postgres_tablespace.present 2016-09-21 14:36:53 +03:00
Mike Place
41d3c09857 Merge pull request #35433 from terminalmage/issue34790 
git.latest: Add a hint for possible rev changes resulting in non-fast-forward failures
 2016-09-21 16:02:18 +09:00
Mike Place
3d23371ca2 Merge pull request #36459 from cachedout/pr-36426 
Pr 36426
 2016-09-21 15:34:28 +09:00
Mike Place
bb5c01ae9d
Lint 2016-09-21 15:34:06 +09:00
Mike Place
87263b9387 Merge pull request #36445 from notpeter/salt_cloud_iam_role 
Better docs for use-instance-role-credentials.
 2016-09-21 14:58:53 +09:00
twangboy
26a40dadbe Update docs for Windows 2016-09-20 17:19:40 -06:00
Nicole Thomas
c8e15dcdca Merge pull request #36442 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-09-20 17:16:30 -06:00
Peter Tripp
469d1a61fe Remove (required). 2016-09-20 10:08:09 -07:00
Peter Tripp
98449e66f5 Better docs for use-instance-role-credentials. 2016-09-20 10:03:23 -07:00
rallytime
2740fb7bfd Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/grains/core.py
 2016-09-20 10:39:53 -06:00
twangboy
fc4a03a75d Check for existing library on Windows 2016-09-20 09:31:13 -06:00
Mike Place
d0a495f08b Merge pull request #36310 from thatch45/keep_loop 
Fix bug where the client will destroy the loop
 2016-09-20 22:14:23 +09:00
Mike Place
6e16ca46ed Merge pull request #36394 from oba11/module-fixes 
fix accound_id in boto_iam and get_region in boto_sns
 2016-09-20 22:11:28 +09:00
Mike Place
266dd7c00a Merge pull request #36379 from twangboy/windows_grains 
Fix windows osrelease grain
 2016-09-20 22:09:39 +09:00