valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
69,783 Commits 24 Branches 182 Tags 341 MiB
da4169bb01
Commit Graph

69783 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
da4169bb01 Merge pull request #33799 from jf/typos 
Fix minor typo in test name in tests/unit/states/dockerng_test.py
 2016-06-06 12:15:07 -07:00
Jeffrey 'jf' Lim
ffa788fd67 Fix minor typo in test name in tests/unit/states/dockerng_test.py 2016-06-07 01:11:30 +08:00
Mike Place
7bcdbd9aeb Merge pull request #33766 from sodium-chloride/develop-2016-0603-1622 
Fix returning 'UTC' as default
 2016-06-06 09:21:39 -07:00
Mike Place
5619ff973a Merge pull request #33795 from cachedout/lint_33753 
Lint fixup
 2016-06-06 09:19:28 -07:00
Mike Place
0731e58470 Lint fixup 
Refs #33753
 2016-06-06 10:18:45 -06:00
Mike Place
49306bc736 Merge pull request #33753 from ticosax/boto_asg.standby 
Add boto_asg.enter_standby and boto_asg.exit_standby
 2016-06-06 09:17:49 -07:00
Nicolas Delaby
9ad99c6816 We now that boto3 is not used in this module 2016-06-06 15:56:17 +02:00
Mike Place
21417a2e11 Merge pull request #33572 from remyd1/custom-net-ps-modules 
Custom net ps modules
 2016-06-06 04:17:10 -07:00
Mike Place
89fe07830b Merge pull request #33775 from jf/allow-sys.list_modules-to-list-exact-match 
Allow sys.list modules to list exact match
 2016-06-06 03:48:06 -07:00
remy.d1
31f58144b4 remove find_non_std... because except File SystemHierarchythere is not a true real standard 2016-06-06 09:04:02 +02:00
remy.d1
e1e016de94 Merge branch 'develop' of https://github.com/saltstack/salt into custom-net-ps-modules 2016-06-06 09:02:07 +02:00
Jeffrey 'jf' Lim
9cf25e160f Fix #33500: allow for sys.list_modules to list a module when given an exact match 2016-06-04 12:51:47 +08:00
Jeffrey 'jf' Lim
738e5c5823 Fix integration test_list_modules_with_arg: pass 'u*' arg correctly 2016-06-04 12:18:16 +08:00
Jεan Sacren
da2ec937b8 Fix returning 'UTC' as default 
In the absence of /etc/adjtime, we should check /etc/conf.d/hwclock for
the correct timescale rather than return 'UTC' as default on Gentoo.
 2016-06-03 16:23:07 -06:00
Mike Place
d90448a3c3 Merge pull request #33755 from cro/proxy_in_opts 
Add default proxy config directories /etc/salt/proxy.d & config in opts
 2016-06-03 12:28:14 -07:00
Mike Place
3eb231a245 Merge pull request #33756 from ticosax/remove-docker-workaound-require-160 
[dockerng] remove limitation in port_binding range
 2016-06-03 10:56:59 -07:00
Nicolas Delaby
f48c7c2787 remove limitation in port_biding range 
By bumping minimum supported version of docker to 1.6.0
 2016-06-03 18:31:52 +02:00
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
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
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
Nicolas Delaby
5603deb72e Add boto_asg.enter_standby and boto_asg.exit_standby 2016-06-03 17:03:27 +02: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
Javier Bértoli
9c587c477d Add example in the docs for varstack as a master_tops 2016-06-03 06:58:30 -03: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
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
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
Mike Place
7c6216c3fc Merge pull request #33700 from sodium-chloride/develop-2016-0602-0155 
Fix incorrect args passed to timezone.set_hwclock
 2016-06-02 11:33:01 -07:00
Mike Place
2210e85f40 Merge pull request #33716 from eyj/format_msec 
Fix millisecond formatting to avoid 1000 as four-digit milliseconds
 2016-06-02 11:32:10 -07:00
Mike Place
64c7dd7032 Merge pull request #33626 from evonzee/feature/issue-15749 
Feature/issue 15749
 2016-06-02 11:23:36 -07:00
Mike Place
132420c03e Merge pull request #33568 from FerrySchuller/patch-1 
Zabbix returner
 2016-06-02 11:20:58 -07:00
Mike Place
e5843ccd9e Merge pull request #33707 from eyj/sentry_return 
Add options to sentry_returner
 2016-06-02 11:18:36 -07:00
Mike Place
38515a01f8 Merge pull request #33664 from DSRCompany/issues/26311_single_schedule 
Single schedule for MultiMinion, EventBus managed by MultiMinion.
 2016-06-02 10:42:00 -07:00
Jεan Sacren
43cc4a8aff Fix speed issue 
Erik Johnson pointed out the speed issue with compelling numbers:

>>> import timeit
>>> t1 = timeit.Timer('clock == "localtime"', 'clock = "localtime"')
>>> t2 = timeit.Timer('clock.__eq__("localtime")', 'clock = "localtime"')
>>> t1.repeat()
[0.061421871185302734, 0.0285952091217041, 0.026736021041870117]
>>> t2.repeat()
[0.1310901641845703, 0.09536910057067871, 0.09479284286499023]

I'll absolutely fix it by using the simple '==' operator.

Thank you!
 2016-06-02 11:38:37 -06:00
Mike Place
b39d623176 Merge pull request #33689 from rvandegrift/dont-copy-minion-public-keys 
During minion verification, read directly from public key file
 2016-06-02 10:31:40 -07:00
Mike Place
98aba3d3b1 Merge pull request #33675 from techhat/armattach 
Allow attaching data disks to VM during creation
 2016-06-02 10:25:48 -07:00
Mike Place
48fc51cb7b Merge pull request #33695 from plastikos/bug-minion_exit_status 
[Bug] minion exit status
 2016-06-02 10:13:55 -07:00
Mike Place
f1150a6893 Merge pull request #33693 from plastikos/improvement-simplify_module_path 
[Trivial] It's silly to use a python module path when the function is in the file.
 2016-06-02 09:40:26 -07:00