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
73,635 Commits 24 Branches 182 Tags 341 MiB
b9a98f551e
Commit Graph

73635 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mwinnett
b9a98f551e Add win_pki unit tests 2016-09-10 23:31:08 -07:00
Mike Place
81fb34ecd0 Merge pull request #36190 from eradman/openbsdpkg 
pkg.install: enable OpenBSD branch and flavor specifications
 2016-09-10 09:06:43 +09:00
Christophe Drevet
4c422f1549 fix cron.absent by identifier on test mode (#36181) 2016-09-09 16:20:58 -06:00
Nicole Thomas
65eb13d918 Merge pull request #36189 from rallytime/merge-develop 
[develop] Merge forward from carbon to develop
 2016-09-09 12:59:38 -06:00
rallytime
167fe00e00 Merge branch 'carbon' into 'develop' 
No conflicts.
 2016-09-09 09:54:17 -06:00
Eric Radman
16e46e36d9 pkg.install: enable OpenBSD branch and flavor specifications 
Support OpenBSD branch specification (%)

  ruby%2.3

As well as flavor specification (--)

  vim--gtk2

By default packages are installed using the base flavor and the stable
branch.

Also add unit tests for OpenBSD package management
 2016-09-09 11:42:10 -04:00
Patrick Valenzuela
b2f1d36e2f Update boto_dynamodb for GSI management and backups (#35878) 
* Update boto_dynamodb state/module for GSI management

* fix trailing whitespace

* modify format strings to conform to file style

* fix lint errors

* fix all but 1 test

* add example
 2016-09-09 08:57:29 -06:00
Mike Place
e1bb2663ba Merge pull request #35985 from DSRCorporation/bugs/35945_salt-key_print_errors_to_stdout 
Print errors to stdout in salt-key as it's done in salt and salt-run.
 2016-09-09 19:03:32 +09:00
Mike Place
d7c012cbd0 Merge pull request #36104 from Cidan/develop 
WIP for GCE salt cloud volume support.
 2016-09-09 19:00:23 +09:00
Mike Place
31b2ef2585 Merge pull request #36124 from twangboy/linux_acl_test_mac 
Skip test on all OS's but linux
 2016-09-09 18:59:35 +09:00
Mike Place
8f609a5799 Merge pull request #36126 from edlane/develop 
Add keepalives to salt-master created connections for better presence
 2016-09-09 18:50:51 +09:00
Mike Place
0e84fc888d Merge pull request #36151 from eyj/req-fix 
Ignore states that do not have a numeric jid, i.e. 'req'
 2016-09-09 18:49:54 +09:00
Mike Place
afd0eb8f18 Merge pull request #36160 from terminalmage/fix-nested-indent 
Allow for nested outputter to accept base indentation level as a kwarg
 2016-09-09 18:46:11 +09:00
Mike Place
a0665a431d Merge pull request #36175 from plastikos/cleanup-redundant_key_write 
[TRIVIAL] Remove redundant write of public key.
 2016-09-09 18:43:24 +09:00
Nicole Thomas
817cd9f42a Merge pull request #36177 from rallytime/merge-develop 
[develop] Merge forward from carbon to develop
 2016-09-08 22:43:22 -06:00
rallytime
2edfef33ae Merge branch 'carbon' into 'develop' 
Conflicts:
  - salt/scripts.py
  - salt/thorium/key.py
  - tests/unit/cloud/clouds/dimensiondata_test.py
  - tests/unit/cloud/clouds/gce_test.py
 2016-09-08 17:31:29 -06:00
Nicole Thomas
f82c91dbd4 Merge pull request #36174 from rallytime/merge-carbon 
[carbon] Merge forward from 2016.3 to carbon
 2016-09-08 17:28:35 -06:00
rallytime
c30f697dfd Pylint fix 2016-09-08 17:23:15 -06:00
Thayne Harbaugh
5e6444b732 Remove redundant write of public key. 2016-09-08 16:26:39 -06:00
rallytime
6da0fbbe96 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - salt/modules/cmdmod.py
  - salt/modules/linux_sysctl.py
  - tests/unit/cloud/clouds/dimensiondata_test.py
  - tests/unit/cloud/clouds/gce_test.py
  - tests/unit/modules/boto_iot_test.py
  - tests/unit/modules/mount_test.py
  - tests/unit/states/boto_iot_test.py
  - tests/unit/utils/network.py
 2016-09-08 16:14:04 -06:00
Nicole Thomas
dc3a68ed8c Merge pull request #36158 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-09-08 15:53:49 -06:00
Joseph Hall
1a7996125a Fix breakage from updates to __utils__ (#36168) 2016-09-08 15:49:45 -06:00
Nicole Thomas
3445a333d5 Remove unclosed backticks in walkthrough doc (#36170) 2016-09-08 15:49:01 -06:00
twangboy
e6b34c414d Add missing import (lint) 2016-09-08 15:37:21 -06:00
Antonio Lobato
d955ae499d fixed whitespace lint issues 2016-09-08 13:57:25 -07:00
Thomas S Hatch
93d8a83271 Merge pull request #36086 from twangboy/mac_power_tests 
Fix tests for mac_power module on various systems.
 2016-09-08 14:52:37 -06:00
Thomas S Hatch
736903222a Merge pull request #36122 from twangboy/mac_system_tests 
Fix test not starting, skip broken functions
 2016-09-08 14:42:48 -06:00
Antonio Lobato
749278c6f0 Added documentation and cleaned up some linting issues. 2016-09-08 12:49:15 -07:00
twangboy
bd65259605 Skip test on anything but linux 2016-09-08 13:46:41 -06:00
Nicole Thomas
0e8e66877a Back-port #36067 to carbon (#36159) 
* Fix signal handling

We had a little mix-up with the args ordering for our signal handling.

This sends the proper signal to processes on cleanup.

I have also temporarily disabled the pytest engines because they were
causing the minions to try to to connect to a master IPC socket which could not be found.

This put the minions into a continual futex state which was not playing well with kill sigs.

* Lint
 2016-09-08 13:03:12 -06:00
Erik Johnson
abe398271b Use string.ascii_lowercase (#36163) 
This is less error-prone than defining a string with all lowercase
letters.

This also uses a tuple for the join as the tuple is a lighter-weight
type and performs the join almost twice as fast as when this is done
with a list, as can be seen below:

>>> import timeit
>>> list_timer = timeit.Timer('":".join(["foo", "bar"])')
>>> tuple_timer = timeit.Timer('":".join(("foo", "bar"))')
>>> list_timer.repeat()
[0.18616199493408203, 0.14670491218566895, 0.14609003067016602]
>>> tuple_timer.repeat()
[0.10539507865905762, 0.08876705169677734, 0.08883404731750488]
>>>
 2016-09-08 13:02:21 -06:00
Pablo Suárez Hernández
235d6308a4 Fixing unit tests for develop (#36141) 
* Fixing skipped boto tests to prevent errors if boto3 does not exists.

* Fix tests to prevent errors when libcloud is not present

* Fix PortageConfigTestCase in case of portage is not present
 2016-09-08 11:15:41 -06:00
Jacob Hammons
4ccf8a841f Merge pull request #36161 from jacobhammons/relnotes 
Adds #36055 to release notes
 2016-09-08 11:11:36 -06:00
Jacob Hammons
ecb0979be7 Adds #36055 to release notes 2016-09-08 11:10:56 -06:00
rallytime
7f955bda0a Merge branch '2015.8' into '2016.3' 
Conflicts:
  - tests/unit/modules/boto_vpc_test.py
  - tests/unit/modules/mount_test.py
  - tests/unit/modules/puppet_test.py
 2016-09-08 10:55:57 -06:00
Erik Johnson
729aade72b Accept kwargs in other outputters 
Since salt.output now passes kwargs, the outputters need to accept them,
even when they do not use them.
 2016-09-08 11:54:44 -05:00
Erik Johnson
4bdd0a8c24 Pass nested_indent to the outputter as a kwarg instead of in opts 2016-09-08 11:49:37 -05:00
Erik Johnson
b42066e574 Accept and pass kwargs when invoking outputters 2016-09-08 11:47:52 -05:00
Erik Johnson
9b9d132a26 Allow nested_indent to be passed as a kwarg 2016-09-08 11:44:19 -05:00
Nicole Thomas
c49d363c3f Pylint fix for #36072 (#36155) 
Refs #36072
 2016-09-08 10:19:44 -06:00
Tom Williams
52b9729635 INFRA-3943 - Bug fix - too many volumes getting tagged (#36072) 
* INFRA-3943 - Bug fix - too many volumes getting tagged

* INFRA-3943 - Wrong indentation on ret['changes'] update

* INFRA-3943 - shut up pylint about perfectly valid python
 2016-09-08 10:17:15 -06:00
David Wittman
7acab9053f Remove unclosed backticks in walkthrough doc (#36154) 2016-09-08 09:48:16 -06:00
Mike Place
6242702288 Fix issue with cp.push (#36136) 
Incorrect handling of os.path.splitdrive()
 2016-09-08 09:27:28 -06:00
Denys Havrysh
0e13118f6e Document owner kwarg for postgres_schema.present state function (#36147) 2016-09-08 09:25:11 -06:00
Nasenbaer
4105ba6e30 Ignore states that do not have a numeric jid, i.e. 'req' 2016-09-08 16:47:21 +02:00
Mike Place
0b35b91caa Merge pull request #36092 from UtahDave/fix_pwd_stacktrace 
don't stacktrace on import pwd on Windows
 2016-09-08 22:26:00 +09:00
Mike Place
c4e54c853d Merge pull request #36125 from rallytime/test-35172 
Add some unit tests for the jid_queue functionality in minion.py
 2016-09-08 22:23:32 +09:00
Mike Place
0648a7f417 Merge pull request #36132 from UtahDave/carbon_grains_test 
add windows core grain test
 2016-09-08 22:21:43 +09:00
Mike Place
1f909038f0 Merge pull request #36139 from meaksh/tests-fixes-for-2016.3 
Fixing unit tests for 2016.3
 2016-09-08 22:20:21 +09:00
Mike Place
3eb3df55ad Merge pull request #36143 from multani/fix-doc-state-mount 
doc: fix doc formatting for salt.states.mount
 2016-09-08 22:11:03 +09:00