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
73,390 Commits 24 Branches 182 Tags 341 MiB
2b92c383f1
Commit Graph

73390 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
870ae49150 Merge pull request #35975 from kev009/fix-35325 
Fix type error in network module for fbsd osmajorrelease compare
 2016-09-02 00:09:30 +09:00
Mike Place
c1e69aa7d1 Merge pull request #35958 from rallytime/aptpkg-fixes 
Clean up the aptpkg.py module
 2016-09-02 00:04:58 +09:00
Mike Place
ceb8629807 Merge pull request #35969 from thatch45/develop 
compensate for lists in cmd perms check
 2016-09-02 00:03:24 +09:00
Mike Place
2da501071e Merge pull request #35967 from twangboy/improve_show_sls_2015.8 
Allow full path to be passed to show_sls (2015.8)
 2016-09-01 23:54:55 +09:00
Mike Place
9ebb405a53 Merge pull request #35974 from techhat/calcminmax 
Add thresholds to calc module
 2016-09-01 23:51:26 +09:00
Mike Place
d86fba15b3 Merge pull request #35981 from cachedout/cptestcase_license 
Update Salt's licensing information to include cptestcase
 2016-09-01 23:48:45 +09:00
Mike Place
300f915e48 Merge pull request #35983 from cachedout/snapper_diff_26 
Skip one Snapper test on 2.6
 2016-09-01 23:48:25 +09:00
Mike Place
25923564d3 Update osmajorrelease calls to match new grain type 2016-09-01 22:24:43 +09:00
Joseph Hall
085c782109 Add thresholds to all functions 2016-09-01 07:00:35 -06:00
Mike Place
beec674141 Skip one Snapper test on 2.6 
There's a slight difference in the diff comparison but we should be
able to catch true failures here with 2.7.
 2016-09-01 20:19:06 +09:00
Mike Place
dd562dd200 Update Salt's licensing information to include cptestcase 
From https://github.com/adamhajari/spyre/blob/master/LICENSE.txt
 2016-09-01 18:46:13 +09:00
Kevin Bowling
3f6ed8592c Fix type error in networkfbsd osmajorrelease compare 2016-08-31 23:05:57 -07:00
Joseph Hall
2d87d33aeb Add threshholds to calc module 2016-08-31 21:40:03 -06:00
Megan Wilhite
8f7df39181 add onfail multiple test (#35968) 2016-08-31 20:40:36 -06:00
Nicole Thomas
dffd664797 Merge pull request #35970 from rallytime/merge-develop 
[develop] Merge forward from 2016.3 to develop
 2016-08-31 20:38:12 -06:00
Thomas S Hatch
b63b342be5 compensate for lists in cmd perms check 2016-08-31 16:41:36 -06:00
rallytime
ae595537ff Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/modules/pkgng.py
 2016-08-31 16:39:54 -06:00
Nicole Thomas
b8ca3f5e4d Merge pull request #35959 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-08-31 16:14:54 -06:00
Nicole Thomas
3057f80448 Add missing CLI examples to some snapper module functions (#35961) 
Fixes test_valid_docs test failure on Suse test VMs
 2016-08-31 15:41:28 -06:00
twangboy
2ed9a82ef8 Allow full path to be passed to show_sls 2016-08-31 15:31:39 -06:00
Aditya Kulkarni
347b05abd0 Add test for cassandra_cql returner's ssl opts parsing (#35944) 2016-08-31 15:26:11 -06:00
twangboy
fae8957112 Update documentation 2016-08-31 15:24:33 -06:00
Nathan Grennan
c0ab563677 Set the return code to 1 on salt-ssh highstate errors 2016-08-31 14:23:33 -07:00
rallytime
bb4605ffee Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/utils/cloud.py
 2016-08-31 15:13:45 -06:00
Daniel Wallace
351a033f7d add versionadded for keystone v3 addition (#35949) 2016-08-31 15:03:42 -06:00
twangboy
ddc40a75e6 Allow full path to be passed to show_sls 2016-08-31 14:58:07 -06:00
Thomas S Hatch
5aaad9e42e Merge pull request #35714 from rallytime/file_module_deprecations 
Remove the file.grep Carbon warning for multiple command line args
 2016-08-31 14:53:13 -06:00
rallytime
29eed927ec Clean up the aptpkg.py module 
- We shouldn't crowd the module namespace at the top of the file with the http proxy options
- Just use `__salt__['config.get']` to get http configuration proxy values
- Should help fix the doc builds on the develop branch (See #35826)
 2016-08-31 14:51:27 -06:00
Andreas Thienemann
2c6de8de53 Ensure network config file has trainling newline 
The /etc/sysconfig/network file on RH type machines is currently created
without a trailing newline only if the NOZEROCONF option is set.
In all other cases, the file will end with a newline.

This PR reformats the template to make sure the file will always
end with a \n newline.
 2016-08-31 22:40:06 +02:00
Jacob Hammons
0f0f15d048 Merge pull request #35956 from jacobhammons/dot12 
Version docs to 2015.8.12
 2016-08-31 14:39:35 -06:00
Jacob Hammons
3e21e35933 Version docs to 2015.8.12 2016-08-31 14:38:16 -06:00
Jacob Hammons
a87b91a8ea Merge pull request #35955 from jacobhammons/dot3 
Version docs to 2016.3.3
 2016-08-31 14:35:55 -06:00
Jacob Hammons
ac8fe6ff9e Version docs to 2016.3.3 2016-08-31 14:34:55 -06:00
twangboy
3721a09ea3 Load UserProfile on RunAs 2016-08-31 13:57:27 -06:00
Joseph Hall
258e9212d9 Make the status beacon more configurable (#35905) 2016-08-31 13:27:23 -06:00
Nicole Thomas
5d5fdf973b Pylint fix for #35930 (#35950) 2016-08-31 13:26:14 -06:00
Heghedus Razvan
bf6e1fa097 Add integration test for groupadd module (#35930) 
Signed-off-by: Heghedus Razvan <razvan.heghedus@ni.com>
 2016-08-31 13:21:07 -06:00
winstonliu1111
3cd64e2cf5 fixed incorrect change status for the old role policy document for boto_iam_role. (#35946) 2016-08-31 13:13:45 -06:00
Pedro Algarvio
f842ddd525 OSX testsuite fixes (#35948) 
* OSX is a bit more restrictive on getting the process information

* OSX says the sockets aren't connected, which is weird, but...

* Close the sockets on OSX
 2016-08-31 13:09:51 -06:00
Tom Williams
3ad79e1516 INFRA-3927 - forgot to re-encode policy as string before submitting 2016-08-31 15:04:23 -04:00
Tom Williams
5ddcef52d3 INFRA-3927 - missing a carriage return 2016-08-31 14:25:48 -04:00
Daniel Wallace
9bdb161eac Add Keystone v3 support (#35911) 
* Openstack keystone V3 API support in keystone modules.

* Python3 compatibility unicode to six.text_type

* Return values of tests: test_user_absent, test_endpoint_absent,
test_role_absent, test_service_absent, test_tenant_absent

* Fixed tests states.test_role_present and states.service_present

* Fixed module tests (not all)

* These are the old tests and need to be rewritten anyway

* fix pylint error

* fix keystone state tests
 2016-08-31 11:55:23 -06:00
Tom Williams
4c85c24b09 INFRA-3927 - compare SQS policies as json rather than strings to avoid unneeded updates 2016-08-31 13:41:08 -04:00
Daniel Wallace
d2db4ea7a2 cachedir should be /cloud not /master (#35897) 
Fixes #35893
 2016-08-31 10:38:43 -06:00
Jacob Hammons
9910b9c6f9 Fix incremental doc builds - OS X, postgres returner, tcp transport doc updates (#35865) 
* Updates doc builds to generate build timestamp only when building for docs.saltstack.com. This re-enables incremental builds.
Adds notes to OS X page that Salt master on OS X is not officially supported
Adds note to postgres returners to cross-link modules with usage explanation (ZD #875)
Adds example showing how to enable tcp transport

* Generate copyright date
Footer updates
 2016-08-31 09:51:36 -06:00
Andres Montalban
24f9d3397c Speed up FreeBSD pkg install process for pkg.latest since pkg command by default tries to update repository DB on each search: (#35904) 
https://www.freebsd.org/cgi/man.cgi?query=pkg-search&sektion=8&apropos=0&manpath=FreeBSD+10.3-RELEASE+and+Ports
 2016-08-31 09:46:13 -06:00
Andres Montalban
17b9a159f9 Speed up FreeBSD pkg install process for pkg.latest since pkg command by default tries to update repository DB on each search: (#35939) 
https://www.freebsd.org/cgi/man.cgi?query=pkg-search&sektion=8&apropos=0&manpath=FreeBSD+10.3-RELEASE+and+Ports
 2016-08-31 09:45:25 -06:00
Denys Havrysh
b87e4f1e85 Salt Cloud: add centos default user for official CentOS AMIs (#35931) 2016-08-31 09:41:55 -06:00
Mike Place
6bcd76bfce Catch shutdown error in test suite (#35933) 
Change made per @s0undt3ch
 2016-08-31 09:35:20 -06:00
Nicolas Delaby
580e0d4aa7 Mention that docker image names must be given with repository (#35926) 2016-08-31 09:26:13 -06:00