Commit Graph

67231 Commits

Author SHA1 Message Date
Neil Williamson
4372dc3816 Automatically detect correct MySQL password column for 5.7 and fix setting passwords (#32440)
* Automatically detect MySQL password column

* Fix changing password in MySQL 5.7

* Fix lint test

* Fix unit tests (?)

They will still fail if "authentication_string" is legitimately the right column name, but I don't know what to do about that.

* Additional unit test fix
2016-04-11 11:07:44 -06:00
Nicole Thomas
019257931b Merge pull request #32453 from jfindlay/tmpdir
tests.integration: fix #32447
2016-04-11 09:40:41 -06:00
Nicole Thomas
42cb261105 Merge pull request #32476 from terminalmage/opkg-override
Add link to provider override docs to opkg.py
2016-04-11 09:38:35 -06:00
Erik Johnson
6f7851f8a4 Add link to provider override docs to opkg.py
This is a companion to https://github.com/saltstack/salt/pull/32458, but
this module was not added until the 2016.3 branch, so the documentation
is being updated there for this module.
2016-04-11 09:10:55 -05:00
Justin Findlay
117d641830 tests.integration: fix 4230c8a 2016-04-08 16:54:00 -06:00
Justin Findlay
fa8d030ab7 tests.integration: bypass MacOS TMPDIR, gettempdir (#32447)
Updates 0edd532, 8f558a5.

When logging in as root over `ssh root@host`, `$TMPDIR` and
`tempfile.gettempdir()` are both set to a variation of:
```
/private/var/folders/zz/zyxvpxvq6csfxvn_n0000000000000/T/
```
When logging in as root over `sudo -i`, `$TMPDIR` is unset and
`tempfile.gettempdir()` is set to `/tmp`.

My guess is that the second case is an unintended or uncorrected omision
by Apple as they have introduced the longer, randomized temp path in a
recent version of MacOS.
2016-04-08 16:00:48 -06:00
Justin Anderson
116c91e293 Changed the target file in file.symlink test (#32443) 2016-04-08 16:00:15 -06:00
Nicole Thomas
8d44aa3f08 Merge pull request #32429 from rallytime/merge-2016.3
[2016.3] Merge forward from 2015.8 to 2016.3
2016-04-08 10:56:12 -06:00
Nicole Thomas
7472141b7d Merge pull request #32437 from rallytime/pgjson_queue_docs
Add pgjsonb_queue to queue doc index
2016-04-08 10:14:40 -06:00
rallytime
5a641ddc2a Pylint fixes 2016-04-08 09:56:03 -06:00
rallytime
1fa7c021b3 Add pgjsonb_queue to queue doc index 2016-04-08 09:08:17 -06:00
rallytime
59b804d230 Merge branch '2015.8' into '2016.3'
Conflicts:
  - salt/modules/pkgng.py
  - salt/modules/status.py
  - salt/states/boto_asg.py
  - salt/states/boto_elb.py
2016-04-07 16:28:59 -06:00
Nicole Thomas
c712fbed37 Merge pull request #32419 from jtand/file_state_test_fix
Fixes test failure where Fedora 23 has /etc/grub.conf by default
2016-04-07 16:15:51 -06:00
Nicole Thomas
5bc8c326ce Merge pull request #32423 from jtand/glusterfs_test_fix
Update glusterfs_test to be inline with #32312
2016-04-07 15:53:03 -06:00
Nicole Thomas
c07e02bacb Merge pull request #32425 from cachedout/issue_31632
Fix salt-cloud paralell provisioning
2016-04-07 15:52:06 -06:00
Mike Place
127c0829ee Fix salt-cloud paralell provisioning
Closes #31632
2016-04-07 14:50:35 -06:00
Justin Anderson
6f98bd50eb Update glusterfs_test to be inline with #32312 2016-04-07 14:38:21 -06:00
Justin Anderson
28ea60f28e Fixes test failure where Fedora 23 has /etc/grub.conf by default 2016-04-07 11:40:12 -06:00
Erik Johnson
005825a30e Merge pull request #32416 from jtand/salt_spec_fix
Updated salt.spec bash_completion
2016-04-07 11:17:19 -05:00
Justin Findlay
b27ccc424b update release candidate testing doc (#32414) 2016-04-07 09:41:46 -06:00
Justin Anderson
65614b7f0f Updated salt.spec bash_completion 2016-04-07 09:16:47 -06:00
Andres Montalban
51fb2ac4c7 FreeBSD supports packages in format java/openjdk7 so the prior commit broke that functionality. Check freebsd/pkg#1409 for more info. 2016-04-07 09:11:42 -06:00
Erik Johnson
709410ada3 Improve git_pillar documentation/logging
* Add note about different behavior of top file in git_pillar

* Make log entry for a missing pillar SLS file more accurate for git_pillar
2016-04-07 09:10:53 -06:00
Nicole Thomas
c53efc3349 Update master config docs 2016-04-07 09:10:19 -06:00
Erik Johnson
2cc054bbc0 Merge pull request #32323 from mcalmer/fix-ensure-installed-latest-with-attributes
fix sorting by latest version when called with an attribute
2016-04-07 01:24:35 -05:00
Erik Johnson
802580ee1a Merge pull request #32376 from amontalban/2015.8
Fixes saltstack/salt#28262
2016-04-06 15:30:10 -05:00
Bo Maryniuk
0d9a06b8c6 Cleaner deprecation process with decorators
* Add deprecation decorator scaffold

* Capture type error and unhandled exceptions while function calls

* Aware of the current and future version of deprecation

* Implement initially is_deprecated decorator

* Add an alias for the capitalization

* Fix capitalization easier way

* Remove an extra line

* Add successor name to the deprecation decorator.

* Granulate logging and error messages.

* Implement function swapper

* Raise later the caught exception

* Clarify exception message

* Save function original name

* Remove an extra line

* Hide an alternative hidden function name in the error message, preserving the error itself

* Rename variable as private

* Add a method to detect if a function is using its previous version

* Message to the log and/or raise an exception accordingly to the status of used function

* Log an error along with the exception

* Add internal method documentation

* Add documentation and usage process for decorator "is_deprecated"

* Add documentation and process usage for the decorator "with_deprecated"

* Hide private method name

* Fix PEP8, re-word the error message

* Deprecate basic uptime function

* Add initial decorator unit test

* Rename old/new functions, mock versions

* Move frequent data to the test setup

* Add logging on EOL exception

* Rename and document high to low version test on is_deprecated

* Implement a test on low to high version of is_deprecated decorator

* Add a correction to the test description

* Remove a dead code

* Implement a test for high to low version on is_deprecated, using with_successor param

* Correct typso adn mistaeks

* Implement high to low version with successor param on is_deprecated

* Setup a virtual name for the module

* Implement test for with_deprecated should raise an exception if same deprecated function not found

* Implement test for with_deprecated an old function is picked up if configured

* Correct test description purpose

* Implement test with_deprecated when no deprecation is requested

* Add logging test to the configured deprecation request

* Add logging testing when deprecated version wasn't requested

* Implement test EOL for with_deprecated decorator

* Correct test explanation

* Rename the test

* Implement with_deprecated no EOL, deprecated other function name

* Implement with_deprecated, deprecated other function name, EOL reached

* Add test description for the with_deprecated + with_name + EOL

* Fix confusing test names

* Add logging test to the is_deprecated decorator when function as not found.

* Add more test point to each test, remove empty lines

* Bugfix: at certain conditions a wrong alias name is reported to the log

* Fix a typo in a comment

* Add test for the logging

* Disable a pylint: None will _never_ be raised

* Fix test for the deprecated "status.uptime" version

* Bugfix: Do not yank raised exceptions

* Remove unnecessary decorator

* Add test for the new uptime

* Add test for the new uptime fails when /proc/uptime does not exists

* Rename old test case

* Skip test for the UTC time, unless freeze time is used.

* Fix pylint

* Fix documentation

* Bugfix: proxy-pass the docstring of the decorated function

* Lint fix
2016-04-06 12:55:45 -06:00
rkgrunt
6979fdaa5f Correcty index glusterfs bricks
Fixes issue #32311
2016-04-06 12:48:20 -06:00
Mike Place
8c30b364ed Merge pull request #32379 from sangoma/v2016.3/fix-key-fingerall
Fix Key.finger_all() method to actually consider all keys
2016-04-06 12:44:21 -06:00
Mike Place
ad77d76cad Merge pull request #32393 from jfindlay/win_zone
modules.win_timezone: don't list all zones in debug log
2016-04-06 12:10:43 -06:00
Justin Findlay
c01c1b9da2 modules.win_timezone: don't list all zones in debug log 2016-04-06 10:46:52 -06:00
Nicole Thomas
76ae95863d Merge pull request #32372 from rallytime/bp-32358
Back-port #32358 to 2015.8
2016-04-06 10:35:05 -06:00
Nicole Thomas
c612baa119 Merge pull request #32392 from multani/2015.8
Fix documentation on boto_asg and boto_elb modules and states
2016-04-06 10:34:35 -06:00
Jonathan Ballet
77c4772752 Fix documentation on boto_asg and boto_elb modules and states 2016-04-06 18:16:13 +02:00
Nicole Thomas
b706d3aa4d Merge pull request #32373 from cachedout/issue_32201
Resolve memory leak in authentication
2016-04-06 09:19:55 -06:00
Nicole Thomas
584175f0ea Merge pull request #32371 from rallytime/bp-31646
Back-port #31646 to 2016.3
2016-04-06 09:17:51 -06:00
Moises Silva
c0f42f608c Fix Key.finger_all() method to actually consider all keys
Use all_keys() instead of list_keys() to consider also local keys

Fix issue #32377
2016-04-06 01:49:10 -04:00
Arthur Lutz
95e0fe7744 outputter virt_list does not exist anymore 2016-04-05 16:03:56 -06:00
Nicole Thomas
b9d1138bd7 Merge pull request #32367 from rallytime/merge-2016.3
[2016.3] Merge forward from 2015.8 to 2016.3
2016-04-05 16:01:51 -06:00
Mike Place
d9e4a0f372 Resolve memory leak in authentication 2016-04-05 15:55:55 -06:00
root
482f482ae6 Fixes #31645. Replaced pillar.item with pillar.get. 2016-04-05 15:43:56 -06:00
Andres Montalban
823d0c362b Fixes saltstack/salt#28262 2016-04-05 18:31:58 -03:00
rallytime
760f479424 Merge branch '2015.8' into '2016.3'
Conflicts:
  - salt/cli/daemons.py
  - salt/config/__init__.py
  - salt/scripts.py
  - salt/state.py
  - tests/unit/config/config_test.py
2016-04-05 15:09:27 -06:00
Nicole Thomas
097aa7ccfc Merge pull request #32126 from cro/outputter_terse_docs
Add a couple CLI examples for the highstate outputter.
2016-04-05 11:23:29 -06:00
Mike Place
eab3b99be2 Merge pull request #32353 from mcalmer/prevent-refresh-on-list-installed-products
Prevent metadata download when listing installed products
2016-04-05 11:02:15 -06:00
Mike Place
64abec94e7 Merge pull request #32321 from abednarik/minion_start_fail_log
Better message when minion fail to start
2016-04-05 10:28:06 -06:00
Nicole Thomas
59aca733ea Merge pull request #32345 from nmadhok/patch-4
[2015.8] Check if profile key exists in vm_ dict
2016-04-05 10:16:35 -06:00
Mike Place
bb033c238d Merge pull request #32343 from Ferbla/2015.8
Fixed win_wua example documentation
2016-04-05 10:14:36 -06:00
Mike Place
3219a8d176 Merge pull request #32360 from rallytime/fix-32354
Make sure hash_type is lowercase in master/minion config files
2016-04-05 10:10:46 -06:00
Mike Place
fb530256f6 Merge pull request #32361 from cro/remove_sdb_exp_flag
SDB is no longer experimental
2016-04-05 10:10:23 -06:00