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

70247 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
C. R. Oldham
8332e6f94e Add default proxy config directories /etc/salt/proxy.d and ability for proxies to be configured by opts in addition to pillar 2016-06-03 10:11:34 -06:00
Mike Place
2c450a7494 Merge pull request #33718 from rallytime/bp-33700 
Back-port #33700 to 2015.8
 2016-06-03 09:10:44 -07:00
Mike Place
56eab363ff Merge pull request #33723 from rallytime/bp-33641 
Back-port #33641 to 2016.3
 2016-06-03 09:07:53 -07:00
Mike Place
b9133326c8 Merge pull request #33726 from jtand/sysmod_skip_valid_docs_glance 
glance.warn_until shouldn't be checked for a doc string
 2016-06-03 09:06:08 -07:00
Mike Place
b07701f0a0 Merge pull request #33727 from terminalmage/issue33725 
Fix git_pillar edge case for remote repos without a master branch
 2016-06-03 09:03:59 -07:00
Mike Place
015e50cec8 Merge pull request #33728 from jfindlay/test_state_test 
Make `configurable_test_state` configurable in test mode
 2016-06-03 09:02:57 -07:00
Mike Place
1cf8fe3f1d Merge pull request #33729 from twangboy/fix_win_servermanager 
Add exclude option to win_servermanager
 2016-06-03 08:53:13 -07:00
Mike Place
4e27bfaa5b Merge pull request #33731 from plastikos/improvement-ensure_parser_messages_have_newline 
[Trivial] Ensure that option parser messages have a newline.
 2016-06-03 08:45:37 -07:00
Mike Place
3f4d4de9ea Merge pull request #33734 from glomium/issue33588 
modules/rabbitmq.py version checking had a logical error
 2016-06-03 08:44:46 -07:00
Mike Place
c5e24782f6 Merge pull request #33736 from nmadhok/patch-1 
call copy.deepcopy properly and pass it opts
 2016-06-03 08:39:27 -07:00
Mike Place
4a9ec5af9d Merge pull request #33737 from hrumph/develop 
Fixed instance of unicode/str comparison and made it unicode/unicode
 2016-06-03 08:37:11 -07:00
Mike Place
7bf36c839c Merge pull request #33738 from quxf2012/patch-1 
Update mysql.py
 2016-06-03 08:35:08 -07:00
Mike Place
6c150d840d Merge pull request #33743 from vutny/drop-debian-community-repo-doc 
Debian installation docs: drop section about community-maintained repo
 2016-06-03 08:29:45 -07:00
Mike Place
c2b970789c Merge pull request #33748 from ticosax/adjust-api-version-host-config 
HostConfig has been introduced by docker api version 1.15
 2016-06-03 08:28:40 -07:00
Mike Place
1001d2b9e7 Merge pull request #33733 from plastikos/test-master_exit_status 
Test master exit status
 2016-06-03 08:27:28 -07:00
Mike Place
4bee3bc9c1 Merge pull request #33735 from jacksontj/develop 
Fix `force` lock for zk_concurrency
 2016-06-03 08:26:27 -07:00
Mike Place
38b7495854 Merge pull request #33749 from netmanagers/develop 
Add example in the docs for varstack as a master_tops
 2016-06-03 08:19:05 -07:00
Mike Place
e08c685a6c Merge pull request #33745 from eliasp/2016.3-typo-privilages-privileges 
Typo (`privilages` → `privileges`)
 2016-06-03 08:14:37 -07:00
Nicolas Delaby
5603deb72e Add boto_asg.enter_standby and boto_asg.exit_standby 2016-06-03 17:03:27 +02:00
Justin Anderson
ff2dae103d ubuntu doesn't install default gems when ruby is installed 2016-06-03 08:54:51 -06:00
C. R. Oldham
35bc42410f Merge pull request #33705 from alexbleotu/json_schema_extension-gh 
JSON Schema Extension
 2016-06-03 08:42:18 -06:00
Alexandru Bleotu
d69ce3a84f JSON Schema Extension 
- added support for JSON schemas that validate complex JSON objects
  (JSON objects that have as attributes other JSON objects)
 2016-06-03 14:03:26 +01:00
Pablo Suárez Hernández
ab738416ba pylint fix 2016-06-03 13:57:13 +01:00
Pablo Suárez Hernández
bf27e5d36e test_members cleanup 2016-06-03 13:25:05 +01:00
Pablo Suárez Hernández
ba815dbf76 improvements on groupadd unit tests 2016-06-03 13:17:13 +01:00
Justin
504df9a65a Fixed lint error 2016-06-03 04:28:42 -06:00
Javier Bértoli
9c587c477d Add example in the docs for varstack as a master_tops 2016-06-03 06:58:30 -03:00
Nicolas Delaby
134e4a9abf HostConfig has been intoriduced by docker api version 1.15 2016-06-03 11:46:55 +02:00
Pablo Suárez Hernández
3bbc5ae0d9 one line is better 2016-06-03 10:08:32 +01:00
Elias Probst
646bc426c6
Typo (privilages → privileges) 2016-06-03 09:54:56 +02:00
Daniel Hobley
636f4c00f0 Make sure we only use GetConnection if we are using a proxy salt minion 2016-06-03 08:57:53 +02:00
quxf2012
a5faf691b7 Update mysql.py 
Fixes mysql.grant_exists bug
If a user both have select, update privilege,when check one privilege will return False
 2016-06-03 14:46:37 +08:00
quxf2012
ad0ba18e3e Update mysql.py 
If a user both have  select, update privilege,when check one privilege will return False
 2016-06-03 12:09:10 +08:00
Michael Walton
b887f92fa7 Merge remote-tracking branch 'upstream/develop' into develop 2016-06-02 23:54:28 -04:00
Michael Walton
75f10c5ceb Fixed instance of unicode/str comparison and made it unicode/unicode 2016-06-02 23:40:25 -04:00
Nitin Madhok
0c31df4665 call copy.deepcopy properly and pass it opts 
opts does not have copy.deepcopy attribute
 2016-06-02 22:48:32 -04:00
Thomas Jackson
de19065367 Fix force lock for zk_concurrency 
If all leases where currently held force would not work. This works around the issue by setting the local max leases to maxint-- to let you grab the lock always
 2016-06-02 17:04:14 -07:00
Justin Findlay
87e018af2a states.test.configurable_test_state: add unit tests 2016-06-02 17:20:36 -06:00
Thayne Harbaugh
a46750c8c5 Various tests to validate proper `salt-master` exit status: 
* Test when ``user`` config setting is an invalid user.

* Test when an unknown argument is given.

* Test Correct ``salt-master`` daemon start up.
 2016-06-02 17:03:59 -06:00
Thayne Harbaugh
68a9912d3a Refactor `testprogram` framework to minimize explicit setup and improve reuse. 
* Add a ``testprogram.TestProgramCase()`` to simplify test classes

  + Has ``setUp()`` and ``tearDown()`` to create ephemeral test directory
    (really should be moved to salttesting.TestCase)

  + Common ``assert_exit_status()`` for validating and reporting failures in
    exit status.

* Add missing ``testprogram.TestDaemonSaltProxy`` class

* Remove specific setting of ``program`` parameter in initialization of
  ``TestDaemonSaltMinion`` since ``testprogram.TestSaltProgramMeta`` already
  handles that unless a specific override is required.

* Automatically set ``user`` in config for master, minion and proxy test
  classes if a specific user is not specified.

* Automatically set ``PYTHONPATH`` as ``sys.path`` unless it is specified.
 2016-06-02 16:51:54 -06:00
twangboy
2de91d166f Fix docstring 2016-06-02 16:41:13 -06:00
Thayne Harbaugh
e057c0c9d0 Ensure that option parser messages have a newline. 
It's possible that this might add newlines where they aren't desired.  If this
is the case then all of the shutdown messages for the classes in
salt/cli/daemons.py require an explicit '\n'.
 2016-06-02 16:38:14 -06:00
Justin Anderson
0cb1bfa0d3 Removed extra : 2016-06-02 16:35:40 -06:00
Erik Johnson
d8ba7ed5a5 Fix git_pillar edge case for remote repos without a master branch 
When the remote repository does not have a master branch, on the initial
checkout there will be no ref in refs/remotes/origin for this branch,
leading to an error being logged and the checkout failing.

Instead of failing the checkout, in these cases we'll create the initial
local HEAD based on the ref we will eventually check out, since we know
for a fact that this ref exists.

Resolves #33725
 2016-06-02 17:33:07 -05:00
Justin Anderson
ebee8a89af glance.warn_until shouldn't be checked for a doc string 2016-06-02 16:30:36 -06:00
Julien Cigar
657d0bf582 split the parsing of resolv.conf from the grains/core module 2016-06-03 00:21:49 +02:00
twangboy
9870479d99 Add exclude option to state 2016-06-02 16:04:19 -06:00
twangboy
50bd76e206 Add exclude option 2016-06-02 15:49:56 -06:00
Sebastian Braun
77a51a00a3 pylint W0141, W0702 2016-06-02 17:34:32 -04:00
Sebastian Braun
f8518939a7 check rabbitmq version and use different api to validate a users password 2016-06-02 17:34:26 -04:00