valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
73,882 Commits 24 Branches 182 Tags 341 MiB
098cf87a6b
Commit Graph

73882 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nicole Thomas
098cf87a6b Merge pull request #36411 from rallytime/merge-develop 
[develop] Merge forward from carbon to develop
 2016-09-19 12:59:08 -06:00
rallytime
bdb15217d3 Merge branch 'carbon' into 'develop' 
No conflicts.
 2016-09-19 11:21:02 -06:00
skizunov
faae3da84c Add 'coalesce' option to inotify beacon (#36404) 
See comments in the beacon for details on the 'coalesce' option.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
 2016-09-19 11:18:12 -06:00
Nicole Thomas
acfce59666 Removes extra empty lines in the disk specificity example (#36410) 2016-09-19 11:13:08 -06:00
Aditya Kulkarni
892df0c089 Add ability to specify disk backing mode for VMware cloud profile (#36334) 
* Add ability to specify disk backing mode for VMware cloud profile

* Update release notes and version added
 2016-09-19 11:05:49 -06:00
Rajvi Dhimar
4ba4d2afbe Update carbon.rst (#36395) 2016-09-19 09:43:56 -06:00
Emanuel Rietveld
ff7883e336 Some modules (e.g. boto_* ones) require utils to be loaded. (#36398) 2016-09-19 09:42:51 -06:00
Mike Place
30d5a7874e Merge pull request #36291 from mchugh19/zabbix_get_template 
add zabbix template.get function
 2016-09-18 10:31:48 +09:00
Christian McHugh
0a21ce9aa2 correct key check 2016-09-17 15:58:28 +01:00
Mike Place
8b7cfa0a5b Merge pull request #36281 from kraney/boto_elasticsearch 
Add support for ElasticsearchVersion parameter
 2016-09-17 19:47:00 +09:00
Mike Place
28fd227ea1 Merge pull request #36250 from UtahDave/fix_set_computer_name 
fix logic problem that prevented name change
 2016-09-17 19:45:01 +09:00
Mike Place
0d94d2e29f Merge pull request #36251 from bailsman/boto_rds_none_parameters 
boto3 doesn't want parameters to be None
 2016-09-17 19:44:28 +09:00
Mike Place
4e40a4f6b1 Merge pull request #36351 from jtand/freebsd_test_fix 
Close open socket on freebsd
 2016-09-17 19:07:39 +09:00
Mike Place
6b9f0f1ac0 Merge pull request #36370 from rallytime/add-versions-report-shortcut 
Add -V option to work with --versions-report
 2016-09-17 19:06:37 +09:00
Mike Place
c0dffdf3c8 Merge pull request #36387 from sjmh/fix/minion_cache_publish 
Fix/minion cache publish
 2016-09-17 18:18:04 +09:00
Steve Hajducko
67521917c4 Create a set from the minion list 2016-09-16 19:06:36 -07:00
Steve Hajducko
7fb1dba182 Skip extra traversals of minion cache for auth 
With a large amount of minions and large ACL sets, check_minions starts
to become rather expensive.  The master's publish was already obtaining
this list ( albeit later in execution ), but by moving it up and passing
it to CkMinion's auth_check, it allows CkMinion's validate_tgt to skip a
cache traversal. Related to #33948
 2016-09-16 19:06:36 -07:00
Nicole Thomas
dd8c82ac5b Be explicit about importing salt.utils.decorators (#36383) 
This is possibly causing problems with one of the dockerng unit tests
on Ubuntu 12. Being explicit the use of identical_signature_wrapper
may help clear up some of the mocking problems with backports and
docker.

I also changed the sys.version_info option to use the six.PY2 global.
This is more consistent with other salt files and essentially does the
same thing and avoids an additional import.
 2016-09-16 16:30:07 -06:00
Nicole Thomas
2f16e43d67 Update the extend.py and extend_test.py imports (#36382) 
When using `fopen`, we need to import all of salt.utils. We should
also be explicit about calling salt.utils.fopen.

This also cleans up the ordering of the salttesting vs salt libs to
be consistent with other files and conform with `ensure_is_syspath`.

Also changes a print statement to a log.info
 2016-09-16 16:26:13 -06:00
Nicole Thomas
73ee12eff7 Merge pull request #36377 from rallytime/merge-develop 
[develop] Merge forward from carbon to develop
 2016-09-16 16:04:53 -06:00
rallytime
93d34af667 Merge branch 'carbon' into 'develop' 
Conflicts:
  - tests/unit/utils/schema_test.py
 2016-09-16 14:38:10 -06:00
Nicole Thomas
b7ef90d85f Merge pull request #36372 from rallytime/merge-carbon 
[carbon] Merge forward from 2016.3 to carbon
 2016-09-16 14:15:42 -06:00
rallytime
0db2b67ed4 Whitespace fix 2016-09-16 13:25:08 -06:00
rallytime
26cf545d03 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - salt/utils/gitfs.py
  - tests/unit/modules/disk_test.py
 2016-09-16 10:35:49 -06:00
Nicole Thomas
495d365e54 Merge pull request #36369 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-09-16 10:31:14 -06:00
rallytime
d86e5ffa06 Add -V option to work with --versions-report 
Fixes #36364
 2016-09-16 10:23:44 -06:00
Joseph Hall
2a77316123 Update usage docs for Thorium (#36368) 2016-09-16 09:52:47 -06:00
rallytime
37aea4188a Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-09-16 09:24:17 -06:00
Thomas S Hatch
40b2e3d189 Merge pull request #36353 from rallytime/refresh-db-cleanup 
Check for Ign/Hit membership instead of == in aptpkg.refresh_db
 2016-09-16 09:20:30 -06:00
Nicole Thomas
df9d9b3624 Merge pull request #36355 from rallytime/bp-36288 
Back-port #36288 to 2015.8
 2016-09-16 08:59:47 -06:00
Joseph Hall
cd30b35a03 Fix calc docstrings (#36366) 2016-09-16 08:53:18 -06:00
Sami Makki
062e812e1b Fix a minor typo in docs (#36365) 2016-09-16 08:52:31 -06:00
Olivier Mauras
e9c2564c57 salt/modules/apk.py: Add version() function support (#36362) 
* salt/modules/apk.py: Add version() function support

* salt/modules/apk.py: Fix lint errors
 2016-09-16 08:44:16 -06:00
Denys Havrysh
3f308d7694 postgres_extension: report changes when an extension was installed (#36335) 
* postgres_extension: report changes when extension was installed or upgraded

* postgres_extension state: fix unit tests
 2016-09-16 08:23:20 -06:00
Mike Place
70ffdafbf0 Schema test requires jsonschema 2.5.0 or above 2016-09-15 17:23:51 -06:00
rallytime
275319193a Check for Ign/Hit membership instead of == in aptpkg.refresh_db 2016-09-15 16:46:28 -06:00
Justin Anderson
b2a1779383 Close open socket on freebsd 2016-09-15 15:37:00 -06:00
nasenbaer13
b433e88d03 Return AES key not found as error key in dict (#36225) 2016-09-15 15:14:05 -06:00
Michael Stella
fbbe9ec571 Quote postgres privilege target names (#36249) 
* Quote postgres privilege target names

Postgres lets you put characters in table/database names which you then must
quote.  So we should always quote.

* Updating unit tests

* Also quote role names.

Role names can also have dashes (or others) in them, so we must also quote
them.
 2016-09-15 15:12:41 -06:00
Tobias Macey
1923d16029 Fixed arguments to VPC peering function (#36268) 
The `is_peering_connection_pending` function as defined in
`modules/boto_vpc` is expecting a kwarg of `conn_name` but in the state
function `accept_vpc_peering_connection` on line 1483 it is called with an argument
of `name`. Updated the state function to use the proper kwarg.
 2016-09-15 15:07:45 -06:00
Julien Cigar
9451141b3f set __virtualname__ to 'service' (#36330) 2016-09-15 14:53:09 -06:00
Thomas S Hatch
d2a583bc22 Merge pull request #36337 from cachedout/conduct 
SaltStack's code of conduct
 2016-09-15 14:44:25 -06:00
Julien BONACHERA
fee3be4d26 Use infoblox_* values if present in arguments (#36339) 2016-09-15 14:42:02 -06:00
Erik Johnson
ef128ad0b0 Return None when find_file identifies the path as a directory (#36342) 
This fixes a traceback in the LocalClient when you try to use
cp.cache_file on a directory instead of a file.
 2016-09-15 14:39:46 -06:00
Daniel Wallace
19eb84860e remove help message from glance module (#36345) 2016-09-15 14:38:42 -06:00
Nicole Thomas
135242c833 Clean up libcloud stack trace (#36314) 
This is the same fix as done in #35658, but for the state module.
 2016-09-15 14:38:20 -06:00
Nicole Thomas
a4bbd5e3d7 Add resize2fs unit test from blockdev_test to disk_test (#36346) 
The blockdev module is being slowly deprecated and its functions moved to
to the disk module instead. There is a test for resize2fs in the blockdev_test
file in the 2015.8 branch (which matches the resize2fs function in the blockdev
module), but this function was moved to the disk file in 2016.3. The test was
never moved over.

I discovered this during a merge forward in #36344. This PR adds the
test from 2015.8 blockdev_test to the 2016.3 disk_test.py, and is adjusted
to work with the disk module accordingly.
 2016-09-15 14:37:53 -06:00
Erik Johnson
f09c3e499f Merge pull request #36350 from terminalmage/docs 
Add note about yumpkg.check_db removal in Boron
 2016-09-15 15:32:31 -05:00
Erik Johnson
b815c98577 Add note about yumpkg.check_db removal in Boron 
Resolves #36292.
 2016-09-15 15:30:07 -05:00
Nicole Thomas
6f757279a5 Merge pull request #36347 from rallytime/merge-carbon 
[carbon] Merge forward from 2016.3 to carbon
 2016-09-15 13:39:29 -06:00