Nicole Thomas
3c5b5914ed
Merge pull request #44865 from nmadhok/develop
...
[develop][salt-cloud][vmware] - Adding capability to specify datastore cluster/datastore for hard disks
2017-12-11 13:34:48 -05:00
Nicole Thomas
6a3162858f
Merge pull request #44862 from twangboy/win_update_build
...
Update build scripts for Oxygen
2017-12-11 10:46:51 -05:00
Nicole Thomas
3fa6281a12
Merge pull request #44918 from jasperla/joyent/image_url
...
joyent: fix default image_url in documentation
2017-12-11 10:03:22 -05:00
Nicole Thomas
ba06b83030
Merge pull request #44876 from terminalmage/unicode_literals
...
Roll back use of explicit unicode literals
2017-12-11 09:51:57 -05:00
Jasper Lievisse Adriaanse
af70080593
joyent: fix default image_url in documentation
2017-12-11 14:47:13 +01:00
Erik Johnson
272044c688
Roll back use of explicit unicode literals
2017-12-10 17:41:45 -06:00
Gareth J. Greenaway
374d1ef4f8
Merge pull request #44850 from AAbouZaid/defaults_merge_enhancements
...
Enhance defaults.merge function.
2017-12-09 14:30:53 -08:00
Gareth J. Greenaway
5da900db19
Merge branch 'develop' into defaults_merge_enhancements
2017-12-09 10:29:07 -08:00
Ahmed AbouZaid
4057256728
pep8 complaint
2017-12-09 01:06:39 +01:00
Nicole Thomas
2a2fad5037
Merge pull request #44818 from Ch3LL/test_true_minion
...
Allow test arg to be used on master or pillar
2017-12-08 17:36:25 -05:00
Nicole Thomas
cd128e8fd5
Merge pull request #44881 from twangboy/osx_update_build
...
Update OSX Build Scripts
2017-12-08 17:34:13 -05:00
Gareth J. Greenaway
a6907b86dc
Merge pull request #44675 from haam3r/develop
...
Fix to enable passing additional arguments to the influxdb execution module
2017-12-08 10:44:16 -08:00
Gareth J. Greenaway
4314d777e0
Merge pull request #44656 from gracinet/44606_glusterfs_peered_self_detection
...
Take IPv6 into account in states.glusterfs.peered
2017-12-08 10:43:02 -08:00
Gareth J. Greenaway
8fa5665417
Merge pull request #44840 from terminalmage/issue30842
...
Add hide_output option to cmd state/exec module
2017-12-08 10:42:09 -08:00
Gareth J. Greenaway
126bc217b5
Merge branch 'develop' into 44606_glusterfs_peered_self_detection
2017-12-08 09:36:19 -08:00
Gareth J. Greenaway
49a4bb8a1f
Merge branch 'develop' into develop
2017-12-08 09:35:02 -08:00
Gareth J. Greenaway
a380561180
Merge branch 'develop' into issue30842
2017-12-08 09:32:39 -08:00
Nicole Thomas
95d9eb5744
Merge pull request #44324 from benediktwerner/accept-minions-from-grains
...
Automatically accept minion keys based on grains
2017-12-08 09:02:01 -05:00
twangboy
04c00827f1
Remove check for sudo
2017-12-07 17:31:31 -07:00
twangboy
b9f2863b60
Improvements to build scripts
...
Upgrade dependencies where available
Downloaded:
- libsodium to 1.0.15
- OpenSSL to 1.0.2n
- Python to 2.7.14
Pip:
- apache-libcloud to 2.2.1
- cffi to 1.11.2
- CherryPy to 13.0.0
- GitPython to 2.1.7
- idna to 2.6
- Jinja2 to 2.9.6
- pyasn1 to 0.4.2
- pyzmq to 17.0.0b3
- requests to 2.18.4
- six to 1.11.0
- tornado to 4.5.2
- cryptography to 2.1.4
- pyOpenSSL to 17.5.0
Update shasums for downloaded updates
Make the scripts self sudo themselves
Since we're forcing the script to run as sudo, remove individual sudo
calls
Move /opt/salt into variable $INSTALL_DIR in the build_env script
2017-12-07 17:21:36 -07:00
Nicole Thomas
218c67e54e
Merge pull request #44858 from terminalmage/pub_opts
...
Don't pass master opts as pub kwargs into RunnerClient or salt.key's WheelClient instance
2017-12-07 17:39:45 -05:00
Gareth J. Greenaway
01dc34cf91
Merge branch 'develop' into 44606_glusterfs_peered_self_detection
2017-12-07 13:43:11 -08:00
Nicole Thomas
5b579459a8
Merge pull request #44796 from sjorge/issue44404
...
Fix for Issue #44404
2017-12-07 16:42:11 -05:00
Nicole Thomas
95a46cf106
Merge pull request #44839 from jessebye/2017.7.2_rds_create_tags_bugfix
...
corrects a bug with passing tags to boto_rds module
2017-12-07 16:10:09 -05:00
Nicole Thomas
53eee476ac
Merge pull request #44638 from terminalmage/new-docker-hotness
...
Many improvements to docker network and container states
2017-12-07 15:50:55 -05:00
Gareth J. Greenaway
13dd5c3095
Merge branch 'develop' into issue30842
2017-12-07 12:46:15 -08:00
Nicole Thomas
15d9a8d3e0
Merge pull request #44644 from mchugh19/fixpip
...
Correct pip parsing
2017-12-07 15:44:13 -05:00
Gareth J. Greenaway
483056dcdb
Merge pull request #44875 from gtmanfred/develop
...
add force and norestorefile for pvcreate
2017-12-07 12:19:47 -08:00
Gareth J. Greenaway
88f8d337d9
Merge pull request #43857 from eyj/sentry_return
...
Sentry return
2017-12-07 12:02:11 -08:00
Gareth J. Greenaway
cd7ff5e611
Merge branch 'develop' into sentry_return
2017-12-07 12:01:05 -08:00
Ahmed AbouZaid
3e96abaa8d
Merge branch 'develop' of https://github.com/saltstack/salt into defaults_merge_enhancements
2017-12-07 20:28:55 +01:00
Nicole Thomas
cd48b75242
Merge pull request #44859 from twangboy/win_fix_integration_tests
...
Fix integration tests on Windows
2017-12-07 13:23:47 -05:00
Daniel Wallace
6e2c7300f8
add force and norestorefile for pvcreate
2017-12-07 09:56:59 -07:00
Nicole Thomas
b6173d6ada
Merge pull request #44851 from AAbouZaid/defaults_deepcopy
...
Add defaults.deepcopy function.
2017-12-07 11:02:53 -05:00
Nicole Thomas
5e3b50d8c1
Merge pull request #44809 from obeleh/alternate_composefile
...
Alternate composefile names
2017-12-07 10:57:28 -05:00
Nicole Thomas
2458e18f47
Merge branch 'develop' into fixpip
2017-12-07 10:56:58 -05:00
Nicole Thomas
2a38063ef0
Merge pull request #44558 from pjcreath/add_file_tree_environments
...
salt.pillar.file_tree: add support for environments, add test
2017-12-07 10:56:27 -05:00
Benedikt Werner
5882a3c779
Fixed line length in docs
2017-12-07 16:31:17 +01:00
Nicole Thomas
becb75a9ee
Merge branch 'develop' into win_fix_integration_tests
2017-12-07 10:31:09 -05:00
Nicole Thomas
3b57e306db
Merge branch 'develop' into test_true_minion
2017-12-07 10:23:06 -05:00
Nicole Thomas
d9cfb253bc
Merge pull request #44526 from bodhi-space/infra5980
...
INFRA-5980 - Fix test=True logic bug in boto_dynamodb.present state function
2017-12-07 10:05:49 -05:00
Nitin Madhok
6feb79480b
Lint Fixes
2017-12-07 00:56:27 -05:00
twangboy
f8110713f8
Use binary instead of unicode for loglevel
2017-12-06 21:31:43 -07:00
Nitin Madhok
d5b4ac25d0
Removing duplicate code
2017-12-06 23:23:22 -05:00
Nitin Madhok
1653c0d1ec
Merge branch 'develop' into develop
2017-12-06 22:28:56 -05:00
Nitin Madhok
575d7811e1
Adding capability to specify datastore cluster for hard disks. Fixes #41941
2017-12-06 22:22:51 -05:00
Nitin Madhok
f626629a0d
Adding utility function to get datastore cluster managed object reference and adding capability to get_datastores utility function to get datastores from a datastore cluster
2017-12-06 22:17:15 -05:00
twangboy
041d6f7568
Roll back futures to 3.1.1 for py3 compat
2017-12-06 17:42:20 -07:00
twangboy
7ed11349b7
Remove CherryPy dependency
2017-12-06 17:09:38 -07:00
twangboy
8934d7fc41
Remove postinstall script, just do it in powershell
2017-12-06 15:47:37 -07:00
