valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
60,632 Commits 24 Branches 182 Tags 341 MiB
b58783b895
Commit Graph

60632 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Justin Findlay
b58783b895 add 2015.8.7 release notes 2016-02-11 17:04:34 -07:00
Mike Place
5c394ac49c Merge pull request #31134 from isbm/isbm-zypper-list-products 
Fix types in the output data and return just a list of products
 2016-02-11 13:19:22 -07:00
Mike Place
8f2e3a26e5 Merge pull request #31120 from gtmanfred/2015.8 
Clean up some bugs in the nova driver
 2016-02-11 13:17:41 -07:00
Mike Place
2d592a398e Merge pull request #31132 from rallytime/fix-31099 
Make sure required profile configurations passed in a map file work
 2016-02-11 13:16:46 -07:00
rallytime
1da03da9df Pylint fix 2016-02-11 11:34:27 -07:00
Daniel Wallace
4a411c0817 fix comment 2016-02-11 12:10:52 -06:00
Mike Place
b831e0a865 Merge pull request #31131 from Ch3LL/megan-20158 
integration test for issue #31014
 2016-02-11 10:33:23 -07:00
Mike Place
e378afd891 Merge pull request #31133 from cachedout/fixup_31121 
Fixup 31121
 2016-02-11 10:32:24 -07:00
Mike Place
a4040da46d Fix bad unit test 2016-02-11 10:31:40 -07:00
Bo Maryniuk
670a326e3d Fix types in the output data and return just a list of products 2016-02-11 18:28:14 +01:00
rallytime
337592ec56 Make sure required profile configurations passed in a map file work 2016-02-11 10:13:37 -07:00
Mike Place
a4a40262f8 Merge pull request #31125 from isbm/isbm-salt-api-service 
Force-kill websocket's child processes faster than default two minutes.
 2016-02-11 09:50:57 -07:00
Mike Place
79c85859bc Merge pull request #31119 from sakateka/fix-for-ipv6only-failover 
fixes for ipv6-only multi-master faliover
 2016-02-11 09:21:45 -07:00
Bo Maryniuk
f73f70375c Force-kill websocket's child processes faster than default two minutes. 2016-02-11 15:16:43 +01:00
Jacek Hojczak
0e68fafb74 Fix alternative module and state. 2016-02-11 09:40:26 +01:00
Daniel Wallace
47ecb7a150 include all ips in public_ips or private_ips 2016-02-11 00:14:49 -06:00
Daniel Wallace
b2e8202f5d dont exit on a missing server 
This errors if a server gets deleted between when the server_list and
show_server commands are run.  When running map files to build servers, this
could cause the entire map to be evaluated as needing to be run.

If a server disappears, just continue and don't include it.
 2016-02-10 23:55:42 -06:00
Daniel Wallace
8ad1ee6db4 clean up references to access_ip extra network 
This should make this slightly better, and have everything documented a bit
better.  If salt-cloud to use an extra network that isn't in public_ips or
private_ips, we will overwrite public_ips, and exit.

Then private_ips and public_ips are handled as normal.

Also remove some redundant code that isn't needed
 2016-02-10 23:54:12 -06:00
Ch3LL
af82b1233a integration test for issue #31014 2016-02-10 21:46:22 -07:00
Sergey Kacheev
2c45d151d1 fix unintentional breaking changes 2016-02-11 10:16:29 +06:00
Sergey Kacheev
043a5e6fd7 fixes for ipv6-only multi-master faliover 2016-02-11 10:04:20 +06:00
Mike Place
825b510030 Merge pull request #31107 from techhat/nebulaprivip 
Don't try to add a non-existent IP address
 2016-02-10 14:52:42 -07:00
Mike Place
c56a819fd8 Merge pull request #31108 from jtand/npm_test_fix 
Changed npm integration test to install request.
 2016-02-10 14:52:02 -07:00
justinta89
a5eac47b25 Changed npm integration test to install request. 
Later versions of npm were having trouble installing pm2 with the git link.
 2016-02-10 14:31:16 -07:00
Joseph Hall
1fa69982c4 Don't try to add a non-existent IP address 2016-02-10 14:23:53 -07:00
Mike Place
de1abae9d1 Merge pull request #31105 from cachedout/lint_30975 
Lint 30975
 2016-02-10 14:11:21 -07:00
Mike Place
446b4c2aff Lint #30975 2016-02-10 14:04:59 -07:00
Mike Place
2e5499748a Merge pull request #31100 from jfindlay/x509_sls 
states.x509: docs: peer.sls -> peer.conf
 2016-02-10 13:47:44 -07:00
Mike Place
f2bede1c00 Merge pull request #31103 from twangboy/fix_reg_state 
Point to reg.delete_key_recursive
 2016-02-10 13:46:53 -07:00
twangboy
fe1ca906d2 Point to reg.delete_key_recursive 2016-02-10 12:34:21 -07:00
Mike Place
94fa76831f Merge pull request #31093 from techhat/spmfix 
Ensure double directories don't get created
 2016-02-10 11:53:47 -07:00
Justin Findlay
6c303b99c2 states.x509: docs: peer.sls -> peer.conf 
Fixes #31069.
 2016-02-10 11:53:35 -07:00
Mike Place
c015ca865c Merge pull request #31095 from jfindlay/link_doc 
modules.file, states.file: explain symbolic links
 2016-02-10 11:53:24 -07:00
Justin Findlay
7d9df6b26c modules.file, states.file: explain symbolic links 
Fixes #31056.
 2016-02-10 11:18:53 -07:00
Mike Place
4d6706b3e7 Merge pull request #31061 from rallytime/revert-breakage 
Revert #30217 - was causing salt-cloud -a breakage
 2016-02-10 11:13:59 -07:00
Mike Place
482eea9883 Merge pull request #31090 from rallytime/bp-30542 
Back-port #30542 to 2015.8
 2016-02-10 11:06:38 -07:00
Joseph Hall
4f4c8877ad Ensure double directories don't get created 2016-02-10 11:04:54 -07:00
Mike Place
5dcaa8d387 Merge pull request #31085 from jacksontj/2015.8 
Correctly remove path we added after loader is completed
 2016-02-10 10:47:21 -07:00
Mike Place
27bf83fa59 Merge pull request #31037 from vutny/correct-doc-install-on-rhel 
Update RHEL installation guide to reflect latest repo changes
 2016-02-10 10:36:04 -07:00
Stephen D. Spencer
67a713f2f6 Some 3rd-party modules (e.g. gnupg) define custom log levels that emit 
at INFO level and above.  This patch sets the color data lookups to
default to TextFormat('reset') rather than producing a stack trace
every time a log message is generated from an affected module.
 2016-02-10 10:15:32 -07:00
Thomas Jackson
dd5051c9e6 Correctly pop the path we added after loader is completed. 
Before this was doing a .pop() which would remove the last thing in sys.path, which is not necessarily the thing we added (in the case that an import modifies sys.path). The original fix was introduced in 4bf1d6838a, this simply ensures that we remove the item we added.
 2016-02-10 08:25:23 -08:00
rallytime
ced2d9f922 Revert #30217 
Reverts commit 1f68ce05bc.
Reverts commit 5264449fdb.

Conflicts:
	salt/runners/cloud.py
 2016-02-10 09:18:57 -07:00
Denys Havrysh
6370ddda9f Update RHEL installation guide 2016-02-10 09:57:17 +02:00
Mike Place
8704750cf9 Merge pull request #31050 from basepi/merge-forward-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2016-02-09 13:13:34 -07:00
Mike Place
f13ffd4608 Merge pull request #31053 from cachedout/boto_test_fix 
Fix boto test failures
 2016-02-09 13:02:16 -07:00
Mike Place
c73b5a4a66 Fix boto_secgroup 2016-02-09 11:52:15 -07:00
Mike Place
25bcc68357 Fix boto test failures 2016-02-09 11:50:26 -07:00
Mike Place
87f2816ef5 Merge pull request #31029 from twangboy/win_defaults 
Windows defaults to multiprocessing true
 2016-02-09 11:20:36 -07:00
Colton Myers
d86e014a39 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    README.rst
    salt/modules/yumpkg.py
 2016-02-09 11:11:36 -07:00
Mike Place
0dcdd0a2a7 Merge pull request #30998 from dmacvicar/dmacvicar-2015.8-27796 
add_key/reject_key: do not crash w/Permission denied: '/var/cache/salt/master/.dfn' (#27796)
 2016-02-09 10:57:36 -07:00