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,427 Commits 24 Branches 182 Tags 341 MiB
f205d5f870
Commit Graph

69427 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
f205d5f870 Fix salt.utils.rm_rf to delete files too (#36572) 
Closes #36568
 2016-09-26 09:50:41 -06:00
Mike Place
d0dd92b037 Merge pull request #36495 from cro/zypper_fix 
Fix pkg.upgrade for zypper
 2016-09-26 19:02:39 +09:00
Mike Place
4bca246a27 Merge pull request #36539 from jfindlay/arch_perms 
Prefer archive.cmd_unzip
 2016-09-26 19:02:11 +09:00
Mike Place
ab50cde391 Merge pull request #36546 from rallytime/fix-36514 
Mercurial Module: Pass the identity_path portion as own arg
 2016-09-26 18:44:30 +09:00
Mike Place
aea55fce61 Merge pull request #36555 from DSRCorporation/bugs/35480_master_shutdown 
Bugs/35480 master shutdown
 2016-09-26 18:25:43 +09:00
Dmitry Kuzmenko
6ad2998715 Wait for kill in ProcessManager should be greater in main process than in subprocess. 
Or it would kill subprocess before it killed his children.
 2016-09-24 17:10:56 +03:00
Dmitry Kuzmenko
c9c45a5d79 Don't set the daemon flag for LoggingQueue process. 
Because the ProcessManager already manages the LoggingQueue lifecycle.
 2016-09-24 15:50:53 +03:00
rallytime
9afe76759e Mercurial Module: Pass the identity_path portion as own arg 
Fixes #36514
 2016-09-23 16:50:06 -06:00
Nicole Thomas
a1e0afe1c7 Merge pull request #36542 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-09-23 16:47:26 -06:00
rallytime
861a001749 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-09-23 15:06:28 -06:00
Nicole Thomas
07c9d040c0 Fixup the rabbitmq_user state test failure (#36541) 2016-09-23 15:05:40 -06:00
Nicole Thomas
5548ed771d Back-port #36435 to 2016.3 (#36532) 
* Added "none" option for pillar_source_merging_strategy

* added none to merging strategy in dictupdate so we no longer log warnings when it is selected

* Updated documentation

* fix for when pillar_source_merging_strategy is not set

* Fix looking up pillar data when merging is set to "none" and no saltenv was passed

* Fix looking up pillar data when merging is set to "none" and no saltenv was passed retry

* Let's not break when no merging strategy is passed

* Capitalisation

* Update on doc
 2016-09-23 13:36:23 -06:00
Nicole Thomas
fe377b3da0 Be explicit about the salt.utils.templates import (#36535) 2016-09-23 13:35:58 -06:00
Nicole Thomas
fcc50c93fc Wrap the entire GrainsAppendTestCase class with destructiveTest (#36537) 
Since all pieces of the GrainsAppendTestCase are destructive, let's
just wrap the whole class test case.

Because the tests themselves as well as the `tearDown` function were
wrapped in a @destructiveTest decorator, some test errors were printing
in the test output when --run-destructive isn't passed at the CLI.

This fixes those test errors.
 2016-09-23 13:35:05 -06:00
Justin Findlay
d64ae48783 states.archive: use archive.cmd_unzip when possible 
cmd_unzip is preferable as python's zip module does not preserve
permissions or mtimes.  See https://bugs.python.org/issue15795.
 2016-09-23 12:59:01 -06:00
Justin Findlay
928a7891b4 modules.archive.unzip: log a warning about perms 
See https://bugs.python.org/issue15795.
 2016-09-23 12:58:26 -06: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
C. R. Oldham
6c5807c4be Fix pkg.upgrade for zypper 2016-09-21 20:05:33 -06: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