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
70,285 Commits 24 Branches 182 Tags 341 MiB
9d049e28e5
Commit Graph

70285 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rallytime
9d049e28e5 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/modules/win_pkg.py
  - salt/states/disk.py
 2016-06-15 17:13:26 -06:00
bensherman
cce6bfaec8 removed method that doesn't exist (#34026) 
* removed method that doesn't work

* added logic for method removed in recent version
 2016-06-15 15:43:19 -04:00
Jorge Schrauwen
13b660cdf7 fix #34038 (#34042) 2016-06-15 15:42:19 -04:00
Nicole Thomas
f546a00dc9 Merge pull request #34025 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-06-15 15:41:00 -04:00
Nicole Thomas
b3751f481f Fix wheel integration test (#34040) 2016-06-15 15:40:15 -04:00
jacobhammons
5fee15b485 Merge pull request #34046 from jacobhammons/release-dev 
Updated latest version for doc site
 2016-06-15 13:24:26 -06:00
Jacob Hammons
cf0d14d6d6 Updated latest version for doc site 2016-06-15 13:23:50 -06:00
jacobhammons
3035520594 Merge pull request #34044 from jacobhammons/3.1 
Updated latest release to 2016.3.1
 2016-06-15 13:20:28 -06:00
Jacob Hammons
a4b67fd1e9 Updated latest release to 2016.3.1 
Clean up installation instructions
code-block type updates
Add link to jinja tutorial
 2016-06-15 11:52:02 -06:00
naegelin
a68c6b80e7 remove bad logic in wait_for_default_password (#33940) 
checking for "!" in the password results in nodes not being bootstrapped
 2016-06-15 13:00:12 -04:00
Bartosz Burclaf
fab1e2b985 Removed !-password check (#33939) 2016-06-15 12:59:56 -04:00
Jared McKnight
f598f96ffe fix launch config creation params (#34014) 2016-06-15 12:56:59 -04:00
Tobias Macey
6237d03d68 Added check for presence of Testinfra library (#34015) 
Added a check for the presence of the Testinfra library before trying to
register the generated functions in the execution and state modules.
 2016-06-15 12:55:09 -04:00
Shane Lee
e4a7190a1d Always make chanes to minion config if set (#34021) 2016-06-15 12:53:42 -04:00
Shane Lee
38e82fb89e Always make changes to minion config if set (#34022) 2016-06-15 12:53:19 -04:00
Jacob Weinstock
70514d2c16 expose environment specific information stored in consul (#34027) 
added support so that the environment grain may be used in the root
path to expose environment-specific information stored in consul.
 2016-06-15 12:41:24 -04:00
Nicole Thomas
5f90717fd3 Merge pull request #34031 from eliasp/2016.3-salt.states.postgres_privileges-doc-priv-list 
`states.postgres_privileges` expects a real list, not a comma-separated string
 2016-06-15 12:34:04 -04:00
Elias Probst
d3198ea538
states.postgres_privileges expects a real list, not a comma-separated string for privileges 2016-06-15 13:38:56 +02:00
Nicole Thomas
9a856bde82 Whitespace fix for develop (#34016) 2016-06-14 17:01:32 -04:00
Mike Place
12f71338f3 Raise a warning to a user if using Py2 byte-compiled files in Py3 (#34006) 2016-06-14 15:01:48 -04:00
Mike Place
8651df7310 Fix hashlib module for python 3 (#34007) 2016-06-14 15:00:40 -04:00
Mike Place
c429483813 Starting on loader documentation (#33999) 
* More work

* More lazyloader docs
 2016-06-14 11:23:17 -04:00
Mike Place
1c728b264d Merge pull request #33996 from cachedout/fix_develop_stacktrace 
Fix develop stacktrace
 2016-06-13 19:56:45 -07:00
Mike Place
2df2844831 Fix unsupported syntax on py2.7 
Prevents this stacktace:

mp@silver ...devel/salt/tests % sudo ./runtests.py -h                                                                                                             (git)-[develop]
Traceback (most recent call last):
  File "./runtests.py", line 14, in <module>
    from integration import TestDaemon, TMP  # pylint: disable=W0403
  File "/home/mp/devel/salt/tests/integration/__init__.py", line 62, in <module>
    import salt.minion
  File "/home/mp/devel/salt/salt/minion.py", line 88, in <module>
    import salt.pillar
  File "/home/mp/devel/salt/salt/pillar/__init__.py", line 16, in <module>
    import salt.fileclient
  File "/home/mp/devel/salt/salt/fileclient.py", line 32, in <module>
    import salt.utils.s3
  File "/home/mp/devel/salt/salt/utils/s3.py", line 168
    except (KeyError, ET.ParseError), err:
 2016-06-13 20:12:36 -06:00
Mike Place
1132bc5d0b Merge pull request #33995 from jacobhammons/doc-fixes 
Understanding Jinja topic, Jinja doc issues.
 2016-06-13 19:00:29 -07:00
Mike Place
e797b42ad9 Merge pull request #33989 from thatch45/t_fall 
Enable transport fallback
 2016-06-13 18:16:21 -07:00
Mike Place
a400f6a6c3 Merge pull request #33900 from amendlik/gitfs-hook-doc 
Document sudo policy for gitfs post-recieve hook
 2016-06-13 18:04:35 -07:00
Mike Place
d8d2b2ee9e Merge pull request #33919 from thatch45/cmd_filter 
Cmd filter
 2016-06-13 18:03:21 -07:00
Mike Place
d3b4daad7f Merge pull request #33973 from rbjorklin/add-consul-pillar-arguments 
Dynamically support params in Consul function call
 2016-06-13 17:54:04 -07:00
Mike Place
32c4f54ea6 Merge pull request #33889 from hrumph/exit3010 
3010 exit codes Remembered for boot session
 2016-06-13 17:50:39 -07:00
Mike Place
28c886edd0 Merge pull request #33980 from twangboy/fix_build 
Use full path to python.exe
 2016-06-13 17:46:14 -07:00
Mike Place
25657b0844 Merge pull request #33991 from rallytime/cleanup-33982 
Clean up boto_sqs module CLI formatting and add version to new funcs
 2016-06-13 17:31:48 -07:00
Mike Place
26fee377ec Merge pull request #33993 from s0undt3ch/2016.3 
Call `sys.exit()` instead of `exit()`
 2016-06-13 17:30:46 -07:00
Jacob Hammons
887a415138 Adds new Understanding Jinja topic, and fixes several Jinja doc issues. 
Removes the "Full list of builtin ..." from each module reference list, leaving just the module type for scanability.

Refs #12470
Refs #10206
Refs #10480
Refs #23522
Refs #33023
 2016-06-13 18:30:42 -06:00
Nicole Thomas
3972dbc773 Lint fix for develop branch (#33992) 2016-06-13 19:50:35 -04:00
Pedro Algarvio
34f7d90d9f
Call sys.exit() instead of exit() 2016-06-14 00:34:38 +01:00
Nicole Thomas
840102d624 Protect the vboxapi import more carefully (#33722) 
* Protect the vboxapi import more carefully

Fixes #33720

* Pylint fix
 2016-06-13 19:25:19 -04:00
rallytime
2348627a51 Clean up boto_sqs module CLI formatting and add version to new funcs 
Refs #33982
 2016-06-13 17:23:00 -06:00
Tom Williams
5e28dc3158 INFRA-1601 - add several utility functions to boto_sqs module (#33982) 2016-06-13 19:20:10 -04:00
Thomas S Hatch
ebead18ee8 Add support to detect the backend to the factory 2016-06-13 16:47:42 -06:00
Thomas S Hatch
4ad8a04d3b Add detect to zmq/raet filter 2016-06-13 16:46:59 -06:00
Thomas S Hatch
0c4959bb4a if the transport is wrong we should throw a clienterrror 2016-06-13 16:46:15 -06:00
Nicole Thomas
99a936e952 Merge pull request #33977 from rallytime/merge-develop 
[develop] Merge forward from 2016.3 to develop
 2016-06-13 15:30:30 -04:00
Nicole Thomas
2e934cffef Merge pull request #33976 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-06-13 15:29:40 -04:00
Adam Mendlik
b4a28e2684 Add clarifying documentation about the need for sudo in the git hook 2016-06-13 13:22:39 -06:00
Michael Walton
0ef1e37b00 change possitioning over ..versionadded text 2016-06-13 14:37:40 -04:00
Michael Walton
f5dcf2859a added .. versionadded:: Carbon for new params and functions 2016-06-13 14:25:37 -04:00
twangboy
dd7d55afb9 Use full path to python.exe 2016-06-13 12:01:15 -06:00
Mike Place
d90aa0257a Merge pull request #33906 from lomeroe/archive_unzip_permissions 
Archive unzip permissions
 2016-06-13 10:21:44 -07:00
Thomas S Hatch
017cb39c5d Adress issues 2016-06-13 11:21:22 -06:00