valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
88,884 Commits 24 Branches 182 Tags 341 MiB
0a2f47a850
Commit Graph

88884 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rallytime
0a2f47a850
Fix merge conflict resolution error: test_napalm_network 
There were merge conflicts in this file during the merge forward, which
I resolved incorrectly. This brings the test module into the proper state.
 2017-12-12 09:49:18 -05:00
rallytime
725adfa7db
Lint fixes 2017-12-12 09:34:47 -05:00
rallytime
db5866d097
Update old utils paths to new utils paths 2017-12-11 18:43:33 -05:00
rallytime
08c71f13e4
Merge branch '2017.7' into 'oxygen' 
Conflicts:
  - doc/ref/configuration/minion.rst
  - doc/topics/thorium/index.rst
  - salt/beacons/__init__.py
  - salt/client/mixins.py
  - salt/client/ssh/wrapper/state.py
  - salt/daemons/masterapi.py
  - salt/grains/extra.py
  - salt/minion.py
  - salt/modules/cron.py
  - salt/modules/file.py
  - salt/modules/mac_user.py
  - salt/modules/napalm_network.py
  - salt/modules/state.py
  - salt/modules/win_file.py
  - salt/modules/win_pkg.py
  - salt/proxy/dummy.py
  - salt/state.py
  - salt/states/file.py
  - salt/states/lxc.py
  - salt/utils/__init__.py
  - salt/utils/schedule.py
  - tests/integration/modules/test_file.py
  - tests/integration/modules/test_groupadd.py
  - tests/integration/ssh/test_state.py
  - tests/integration/states/test_file.py
  - tests/unit/daemons/test_masterapi.py
  - tests/unit/grains/test_core.py
  - tests/unit/modules/test_disk.py
  - tests/unit/modules/test_napalm_network.py
  - tests/unit/modules/test_state.py
  - tests/unit/test_minion.py
  - tests/unit/utils/test_process.py
 2017-12-11 18:24:41 -05:00
Nicole Thomas
ba6146250a
Merge pull request #44891 from twangboy/win_fix_verify 
Fix issue with unsafe path in Windows jenkins tests
 2017-12-11 16:10:42 -05:00
Nicole Thomas
887f422efa
Merge pull request #44925 from terminalmage/alias_function 
Force name to be a str type in salt.utils.functools.alias_function
 2017-12-11 15:59:05 -05:00
Nicole Thomas
1b94d0c3ac
Merge pull request #44496 from damon-atkins/2017.7_utils_pkg_win_NEW 
utils/pkg/win.py Introducing new library to gather windows software/component info
 2017-12-11 15:31:52 -05:00
Nicole Thomas
37eb35a84b
Merge pull request #44844 from gtmanfred/shade 
Rewrite openstack driver to use shade
 2017-12-11 14:15:07 -05:00
Nicole Thomas
37a6355f7b
Merge pull request #44170 from wcannon/saltcheck 
Adding salt rendering to saltcheck tests
 2017-12-11 13:44:45 -05:00
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
85160fd297
Merge pull request #44921 from Ch3LL/log_test 
Add test to ensure log files are created
 2017-12-11 13:24:15 -05:00
Nicole Thomas
54d29a61cb
Merge pull request #44787 from rallytime/groupadd-destructive-clean 
GroupAdd test: Add destructive test decorator to entire class
 2017-12-11 13:14:17 -05:00
Erik Johnson
cd6d9424da
Force name to be a str type in salt.utils.functools.alias_function 2017-12-11 12:00:19 -06:00
Ch3LL
3bb58fb577
skip salt-key log creation test 2017-12-11 10:59:10 -05:00
Daniel Wallace
9e5d6c03f8
Merge branch 'develop' into shade 2017-12-11 08:53:13 -07: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
0292e3612a
Merge pull request #44895 from mvivaldi/filters-doc 
Jinja Filters doc
 2017-12-11 10:32:06 -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
Nicole Thomas
df28f312ac
Merge pull request #44879 from rallytime/merge-2017.7 
[2017.7] Merge forward from 2016.11 to 2017.7
 2017-12-10 11:53:43 -05: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
mvivaldi
62409d608a Added Escape Filters and Set Theory Filters in jinja documentation 2017-12-09 09:48:55 +01: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
Nicole Thomas
8e14bc3941
Merge pull request #44880 from UtahDave/2017.7local 
Determine windows hardware arch correctly
 2017-12-08 17:24:08 -05:00
twangboy
7232579167
Allow test suite file_roots as a safe path 2017-12-08 14:42:11 -07:00
David Boucha
6e3c7ac1ac
Merge branch '2017.7' into 2017.7local 2017-12-08 12:01:03 -07:00
Nicole Thomas
dc51174670
Merge pull request #44861 from twangboy/win_fix_lgpo_invalid_value 
Fix win_lgpo for unknown values
 2017-12-08 13:52:04 -05:00
Nicole Thomas
f5a143f8c5
Merge pull request #44621 from isbm/isbm-bsc1068446-2017.7 
Bugfix: errors in external pillar causes crash, instead of report of them
 2017-12-08 13:46:55 -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
Damon Atkins
77b98d7d0b missed one doc-string fix 2017-12-09 01:59:29 +11:00
Damon Atkins
9210517d36 Merge remote branch 'refs/remotes/upstream/develop' into 2017.7_utils_pkg_win_NEW 2017-12-09 01:50:48 +11:00
Damon Atkins
37b1a45c69 Fix doc-string format 2017-12-09 01:48:48 +11: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
David Boucha
dae9c6aa5c
Determine windows hardware arch correctly 
Also allow for setting path to arbitrary windows python environment
 2017-12-07 15:42:07 -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
rallytime
23c5a4ca3e
Merge branch '2016.11' into '2017.7' 
Conflicts:
  - salt/modules/win_pkg.py
  - salt/states/file.py
  - tests/integration/states/test_file.py
  - tests/unit/states/test_file.py
 2017-12-07 17:33:03 -05:00
Ch3LL
6a379195bc
Add test to ensure log files are created 2017-12-07 17:31:26 -05:00
Gareth J. Greenaway
01dc34cf91
Merge branch 'develop' into 44606_glusterfs_peered_self_detection 2017-12-07 13:43:11 -08:00