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
73,847 Commits 24 Branches 182 Tags 341 MiB
85907ef008
Commit Graph

73847 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
puneet kandhari
3ac308ac76 Update aptpkg.py 2016-09-16 11:22:11 -05: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
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
twangboy
92034936c1 Fix windows grains for os 2016-09-15 17:46:16 -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
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
Nicole Thomas
f65734b9fd Merge pull request #36348 from rallytime/bp-36288 
Back-port #36288 to carbon
 2016-09-15 13:39:08 -06:00
Mike Place
340d7fdc53 Schema test requires jsonschema 2.5.0 or above 2016-09-15 12:20:49 -06:00
puneet kandhari
892cc4cd48 Update aptpkg.py 2016-09-15 12:48:58 -05:00
rallytime
95313aecbd Merge branch '2016.3' into 'carbon' 
No conflicts.
 2016-09-15 11:48:22 -06:00
Nicole Thomas
a33da842c0 Merge pull request #36344 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-09-15 11:38:57 -06:00
rallytime
d1f560147d Merge branch '2015.8' into '2016.3' 
Conflicts:
  - tests/unit/modules/blockdev_test.py
 2016-09-15 11:37:56 -06:00
Mike Place
52e9ba4076 Revert "Skip some tests on MacOS" (#36341) 2016-09-15 11:12:04 -06:00
puneet kandhari
cbe98d97a3 Fix pylint whitespace errors 2016-09-15 11:48:45 -05:00
David Boucha
02b9d8f2f5 check for PY2 instead of PY3 2016-09-15 10:16:09 -06:00
David Boucha
3133cbf4cf don't decode strings on Python 3 2016-09-15 10:16:08 -06:00
David Boucha
2caeafbf0b fix logic problem that prevented name change 2016-09-15 10:16:08 -06:00
Pablo Suárez Hernández
dc518c5340 Skip test_resize2fs if resize2fs does not exists (#36325) 2016-09-15 10:14:50 -06:00
Andrew Hammond
3a37fe5df9 merge error overwrites correct ssh_host with stale data in ip_address (#36312) 2016-09-15 10:00:30 -06:00
Thomas S Hatch
d69878127e Merge pull request #36284 from jfindlay/mac_skip 
Skip some tests on MacOS
 2016-09-15 09:46:30 -06:00
Mike Place
2fb61b9c9f SaltStack's code of conduct 2016-09-16 00:32:01 +09:00
Erik Johnson
d9726f73a7 Remove reference to no-longer-skipped test 2016-09-15 08:57:38 -05:00
Erik Johnson
83cb406cc9 Merge branch 'twangboy-mac_pip_tests' into carbon 2016-09-15 08:56:49 -05:00
Erik Johnson
55fb5f4d2f Merge branch 'mac_pip_tests' of https://github.com/twangboy/salt into twangboy-mac_pip_tests 2016-09-15 08:56:21 -05:00
Mike Place
f5e37daba9 Merge pull request #36326 from cachedout/fix_extend_test 
Fix extend test
 2016-09-15 20:45:53 +09:00
Mike Place
93f2d108ae Fix extend test 
The test suite can't guarantee what the pwd will be. Pass it into the function under test.
 2016-09-15 20:39:39 +09:00
Mike Place
57c9cda113 Merge pull request #36324 from cachedout/minion_unique_loop_test 
Give each minion instance a new loop to avoid stale loops
 2016-09-15 20:11:56 +09:00
Mike Place
1cdfad28e8 Give each minion instance a new loop to avoid stale loops 2016-09-15 20:11:12 +09:00
Mike Place
95ac91c835 Merge pull request #36322 from cachedout/safe_minion_shutdown_tests 
Safely shutdown the minion in minion test
 2016-09-15 17:52:45 +09:00
Mike Place
70ea92db95 Safely shutdown the minion 
The test is racing the callback in the minion init.

cc: @rallytime
 2016-09-15 17:51:00 +09:00
Shane Lee
be810aaccc Merge pull request #2 from terminalmage/mac_pip_tests 
Ensure we have a test venv created using virtualenv < 13.0
 2016-09-14 22:27:21 -06:00