Nicole Thomas
|
3872e34156
|
Merge pull request #47836 from slivik/fix-zabbix-template-component-order
Fixes zabbix template components creation order
|
2018-05-25 16:56:13 -04:00 |
|
Nicole Thomas
|
39b95e0bf9
|
Merge pull request #47400 from mcd1992/pkiminions_fix
Added masterless support to utils/minions.py:_pki_minions function
|
2018-05-25 16:43:12 -04:00 |
|
Nicole Thomas
|
9acb5473ef
|
Merge pull request #47821 from jheidbrink/correct_port
Specify the correct port in socket.connect
|
2018-05-25 16:34:39 -04:00 |
|
Nicole Thomas
|
6ba96d8c11
|
Merge pull request #47839 from nicholasmhughes/fix-azure-deploy-to-vnet-in-diff-rg
Fix Azure RM cloud module network_resource_group handling
|
2018-05-25 16:33:12 -04:00 |
|
Gareth J. Greenaway
|
f905234668
|
Merge pull request #47840 from rallytime/stale-config-update
Reduce the number of days an issue is stale by 10
|
2018-05-25 07:46:46 -07:00 |
|
rallytime
|
583f25cfbd
|
Reduce the number of days an issue is stale by 10
|
2018-05-25 10:28:43 -04:00 |
|
nicholasmhughes
|
af16e50856
|
fixes #47794 where network_resource_group doesn't behave properly
|
2018-05-25 10:05:50 -04:00 |
|
Nicole Thomas
|
13cd450394
|
Merge pull request #47814 from travispaul/fix-pkgin-bug-add-tests
Bugfixes and unit tests for pkgin module
|
2018-05-25 09:30:25 -04:00 |
|
Nicole Thomas
|
c69a9a2dd1
|
Merge pull request #47810 from rmcintosh/fix-linode-plan-selection
Fix Linode plan selection
|
2018-05-25 09:27:44 -04:00 |
|
Aaron
|
6301b31a85
|
Merge branch 'develop' into pkiminions_fix
|
2018-05-25 08:23:32 -05:00 |
|
slivik
|
403746e51a
|
Fixes zabbix template components creation order
|
2018-05-25 15:10:53 +02:00 |
|
rmcintosh
|
6774602093
|
better debug message
also, give Cloud Profile its proper capitalization
and some minor formatting consistency updates
|
2018-05-24 23:35:52 -04:00 |
|
rmcintosh
|
a8c4b2f3b9
|
Merge branch 'develop' into fix-linode-plan-selection
|
2018-05-24 14:59:02 -04:00 |
|
rmcintosh
|
77ca3a2a37
|
Address PR feedback
|
2018-05-24 14:58:42 -04:00 |
|
Travis Paul
|
3a888ae833
|
Lint test_pkgin.py
|
2018-05-25 00:58:12 +08:00 |
|
Nicole Thomas
|
2019cc8960
|
Merge pull request #47261 from shtrom/bash-completion-log-level-and-function-cache
Bash completion log level and function cache
|
2018-05-24 12:37:11 -04:00 |
|
rmcintosh
|
10e7679e55
|
make decode_linode_plan_label a private function
|
2018-05-24 10:05:02 -04:00 |
|
Jan Heidbrink
|
67ab9eb9bf
|
Specify the correct port in socket.connect
|
2018-05-24 15:55:29 +02:00 |
|
Travis Paul
|
90cb665e6f
|
pkgin latest_version bugfix
Handle case where the currently installed package is the latest
|
2018-05-24 15:27:28 +08:00 |
|
Travis Paul
|
9ae2ebecf5
|
Bugfixes and unit tests for pkgin module
Corrects pkg.lastest_version and pkg.file_dict behavior
|
2018-05-24 14:39:09 +08:00 |
|
rmcintosh
|
3f81721678
|
fix raising when a 'GB' format invalid plan is supplied
|
2018-05-23 17:00:37 -04:00 |
|
rmcintosh
|
69f10a5366
|
slight cleanup
|
2018-05-23 16:57:46 -04:00 |
|
rmcintosh
|
9572a8b327
|
match quotation mark types properly
|
2018-05-23 16:57:45 -04:00 |
|
rmcintosh
|
3c9a608d52
|
more consistent use of parens in logged warning
|
2018-05-23 16:57:45 -04:00 |
|
rmcintosh
|
fd18751b5f
|
log a warning when the user supplied a label we could decode but was not in the proper format
|
2018-05-23 16:57:45 -04:00 |
|
rmcintosh
|
728db8135a
|
reduce complexity of get_plan_id by moving decoding of the user-supplied label to its own function
|
2018-05-23 16:57:45 -04:00 |
|
rmcintosh
|
23453dc04f
|
Fix Linode plan selection
|
2018-05-23 16:57:45 -04:00 |
|
Nicole Thomas
|
28629d4818
|
Merge pull request #47774 from nicholasmhughes/fix-azurearm-bootstrap-exception
Fix azurearm bootstrap exception
|
2018-05-23 16:23:48 -04:00 |
|
Nicole Thomas
|
dc7fd3aca0
|
Merge pull request #47801 from rallytime/merge-develop
[develop] Merge forward from 2018.3 to develop
|
2018-05-23 16:12:58 -04:00 |
|
Nicole Thomas
|
2089837a0e
|
Merge pull request #47809 from garethgreenaway/45373_documentation_reload_grains_example
[develop] Adding an example of using reload_grains
|
2018-05-23 16:08:43 -04:00 |
|
Gareth J. Greenaway
|
c1582c27d4
|
Adding an example of using reload_grains
|
2018-05-23 11:37:39 -07:00 |
|
Nicholas Hughes
|
b10ae4cf5e
|
Merge branch 'develop' into fix-azurearm-bootstrap-exception
|
2018-05-23 13:39:35 -04:00 |
|
Nicole Thomas
|
c21e8c7f0c
|
Merge pull request #47754 from aphor/salt_cloud_vm_name_None
correctly handle AWS provider setting config vm_[name] to None
|
2018-05-23 13:11:19 -04:00 |
|
rallytime
|
8d3c2be61c
|
Merge branch '2018.3' into 'develop'
Conflicts:
- salt/modules/kubernetes.py
- salt/modules/opkg.py
- salt/modules/useradd.py
- salt/output/table_out.py
- salt/states/mysql_query.py
- salt/states/user.py
|
2018-05-23 12:57:58 -04:00 |
|
Nicole Thomas
|
1efe891c42
|
Merge pull request #47776 from garethgreenaway/970_two_minion_unit_tests_failing
[2018.3] Fixes to failing _before_connect tests
|
2018-05-23 11:10:34 -04:00 |
|
Nicole Thomas
|
4a6ca67883
|
Merge pull request #47783 from rallytime/merge-2018.3
[2018.3] Merge forward from 2018.3.1 to 2018.3
|
2018-05-23 10:51:55 -04:00 |
|
Nicole Thomas
|
a83490ea2a
|
Merge pull request #47446 from Rockin2/add-delay-parameter-to-create-trigger-in-win_task
Add delay parameter to create_trigger in win_task.py.
|
2018-05-23 10:50:25 -04:00 |
|
Nicole Thomas
|
eedb8803a1
|
Merge pull request #47795 from rrzaripov/remove-duplicate-ssh-port-option-in-cloud-misc-doc
Deleting duplicate description for SSH Port option in salt-cloud docs
|
2018-05-23 10:42:59 -04:00 |
|
Jeremy McMillan
|
719d18c958
|
correctly handle AWS provider setting vm_[name] to None
|
2018-05-23 07:50:06 -05:00 |
|
Renat Zaripov
|
cf4669be8d
|
Deleting duplicate description for SSH Port option in salt-cloud miscellaneous options topic
|
2018-05-23 15:36:29 +03:00 |
|
Olivier Soucy
|
7dbf40e099
|
Merge branch 'add-delay-parameter-to-create-trigger-in-win_task' of github.com:Rockin2/salt into add-delay-parameter-to-create-trigger-in-win_task
|
2018-05-22 21:13:50 -04:00 |
|
Olivier Soucy
|
d910da6986
|
Move delay parameter to the bottom in add_trigger in win_task.py
|
2018-05-22 21:12:53 -04:00 |
|
Gareth J. Greenaway
|
a5011b49ab
|
Merge branch '2018.3' into 970_two_minion_unit_tests_failing
|
2018-05-22 14:41:10 -07:00 |
|
Nicole Thomas
|
f8a6a85d28
|
Merge pull request #47149 from meaksh/2018.3-remove-trailing-commas-on-linux-user-gecos-fields
[2018.3] Strip trailing commas on Linux user's GECOS fields
|
2018-05-22 17:18:48 -04:00 |
|
rallytime
|
1adb8ea27f
|
Merge branch '2018.3.1' into '2018.3'
No conflicts.
|
2018-05-22 17:14:31 -04:00 |
|
Nicole Thomas
|
9c610da0bc
|
Merge pull request #47782 from rallytime/bp-47775
Back-port #47775 to 2018.3.1
|
2018-05-22 16:56:36 -04:00 |
|
Daniel Wallace
|
bab9c966c5
|
catch UnsupportedOperation with AssertionError
|
2018-05-22 16:13:08 -04:00 |
|
Gareth J. Greenaway
|
ef24f72169
|
Fixing unit.test_minion.MinionTestCase.test_beacons_before_connect and unit.test_minion.MinionTestCase.test_scheduler_before_connect.
|
2018-05-22 12:12:49 -07:00 |
|
Nicole Thomas
|
d0ecee9f6a
|
Merge pull request #47428 from Tanoti/ipaclient-group-auth-with-stringutils-support
Also search groupattribute when using ipa client (extending #45859)
|
2018-05-22 14:49:45 -04:00 |
|
Nicole Thomas
|
4adf10b20b
|
Merge pull request #47770 from rallytime/bp-47769
Back-port #47769 to 2018.3.1
|
2018-05-22 13:27:19 -04:00 |
|