valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
39,043 Commits 24 Branches 182 Tags 341 MiB
17c5810c04
Commit Graph

39043 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Colton Myers
17c5810c04 Merge pull request #23891 from basepi/releasenotes 
Update the release notes index page
 2015-05-18 17:06:52 -06:00
Colton Myers
dec153bcea Update the release notes index page 2015-05-18 17:06:27 -06:00
Colton Myers
a93e58f80f Merge pull request #23888 from basepi/v2014.7.6release 
Update the 2014.7.6 release notes with CVE details
 2015-05-18 16:35:51 -06:00
Colton Myers
49921b6cb2 Update the 2014.7.6 release notes with CVE details 2015-05-18 16:34:48 -06:00
Justin Findlay
50730287bb Merge pull request #23871 from rallytime/bp-23848 
Backport #23848 to 2014.7
 2015-05-18 14:34:04 -06:00
dumol
379c09c3a5 Updated for SLES 12. 
Added updated instructions for latest SLES release, using the relevant repo.
 2015-05-18 13:11:42 -06:00
Justin Findlay
aee00c83df Merge pull request #23810 from rallytime/bp-23757 
Backport #23757 to 2014.7
 2015-05-18 09:30:21 -06:00
Justin Findlay
6b3352bb1a Merge pull request #23809 from rallytime/virt_get_nics_fix 
Fix virtualport section of virt.get_nics loop
 2015-05-18 09:30:08 -06:00
Joseph Hall
188f03f567 Merge pull request #23823 from gtmanfred/2014.7 
add link local for ipv6
 2015-05-17 06:48:25 -06:00
Daniel Wallace
5ef006d59d add link local for ipv6 2015-05-17 01:17:58 -05:00
Z. Liu
fb32c32065 use abspath, do not eliminating symlinks 
realpath will eliminating symlinks, so following sls won't work as expected

/root/a:
  file.directory:
    - user: root
    - group: root
    - mode: 0755
    - clean: True
    - require:
      - file: /root/a/b

/root/a/b:
  file.symlink:
    - user: root
    - group: root
    - target: /etc
 2015-05-16 10:49:58 -06:00
rallytime
0616fb7884 Fix virtualport section of virt.get_nics loop 2015-05-16 10:46:33 -06:00
Justin Findlay
f3ca682f92 Merge pull request #23802 from gtmanfred/2014.7 
if it is ipv6 ip_to_int will fail
 2015-05-15 22:06:59 -06:00
Daniel Wallace
2da98b58c8 if it is ipv6 ip_to_int will fail 
fixes bug introduced in #23573
 2015-05-15 19:51:37 -05:00
Thomas S Hatch
d9af0c3e82 Merge pull request #23488 from cellscape/lxc-cloud-fixes 
LXC cloud fixes
 2015-05-15 12:09:35 -06:00
Colton Myers
808bbe1cb2 Merge pull request #23748 from basepi/salt-ssh.roster.host.check 
[2014.7] Log salt-ssh roster render errors more assertively and verbosely
 2015-05-14 16:38:10 -06:00
Thomas S Hatch
72cf360255 Merge pull request #23731 from twangboy/fix_22959 
Fixes #22959: Trying to add a directory to an unmapped drive in windows
 2015-05-14 15:59:13 -06:00
Thomas S Hatch
2610195262 Merge pull request #23730 from rallytime/bp-23729 
Backport #23729 to 2014.7
 2015-05-14 15:58:34 -06:00
Colton Myers
bc53e049e0 Log entire exception for render errors in roster 2015-05-14 15:40:23 -06:00
Colton Myers
753de6a621 Log render errors in roster to error level 2015-05-14 15:40:04 -06:00
Colton Myers
e01a7a90b3 Always let the real YAML error through 
The real message is always (probably) going to be more helpful than
"Unknown".
 2015-05-14 15:38:54 -06:00
twangboy
88e5495b2d Fixes #22959: Trying to add a directory to an unmapped drive in windows 2015-05-14 17:20:57 +00:00
Christer Edwards
1877caecba adding support for nested grains to grains.item 2015-05-14 11:09:51 -06:00
Thomas S Hatch
3e9df883d6 Merge pull request #23688 from twangboy/fix_23415 
Added inet_pton to utils/validate/net.py for ip.set_static_ip in windows
 2015-05-14 10:15:56 -06:00
twangboy
6a91169bae Fixed unused-import pylint error 2015-05-13 16:02:34 -06:00
twangboy
5e25b3f355 fixed pylint errors 2015-05-13 15:48:12 -06:00
twangboy
1a9676626f Added inet_pton to utils/validate/net.py for ip.set_static_ip in windows 2015-05-13 15:01:30 -06:00
Justin Findlay
1b86460d73 Merge pull request #23680 from cachedout/issue_23403 
Rename kwarg in cloud runner
 2015-05-13 13:44:02 -06:00
Justin Findlay
cd64af0ce4 Merge pull request #23674 from cachedout/issue_23548 
Handle lists correctly in grains.list_prsesent
 2015-05-13 12:34:58 -06:00
Justin Findlay
d322a19213 Merge pull request #23672 from twangboy/fix_user_present 
Fix user present
 2015-05-13 12:30:09 -06:00
Justin Findlay
43f7025000 Merge pull request #23670 from rallytime/bp-23607 
Backport #23607 to 2014.7
 2015-05-13 12:27:17 -06:00
Mike Place
d5986c21b4 Rename kwarg in cloud runner 
Closes #23403
 2015-05-13 12:15:06 -06:00
Mike Place
da8a2f5cb3 Handle lists correctly in grains.list_prsesent 
Closes #23548
 2015-05-13 11:31:07 -06:00
salt_build
731e7af3dd Merge branch '2014.7' of https://github.com/saltstack/salt into fix_user_present 2015-05-13 17:13:05 +00:00
Azidburn
ed30dc4642 Fix for #23604. No error reporting. Exitcode !=0 are ok 2015-05-13 11:06:56 -06:00
salt_build
d6f70a4545 Fixed user.present to create password in windows 2015-05-13 17:06:41 +00:00
Nicole Thomas
0f006ac1d8 Merge pull request #23661 from rallytime/merge-23640 
Merge #23640 with whitespace fix
 2015-05-13 09:47:30 -06:00
rallytime
4427f42bb6 Whitespace fix 2015-05-13 09:14:49 -06:00
Nicole Thomas
84e2ef88fc Merge pull request #23639 from cachedout/issue_23452 
Handle exceptions raised by __virtual__
 2015-05-13 09:11:12 -06:00
Nicole Thomas
bd9b94ba8c Merge pull request #23637 from cachedout/issue_23611 
Convert str master to list
 2015-05-13 09:08:19 -06:00
Mike Place
56cb1f52e3 Fix typo 2015-05-13 03:16:39 -06:00
Mike Place
d418b49a77 Syntax error! 2015-05-13 02:48:28 -06:00
Mike Place
dd9115466e Add warning to get_or_set_hash about reserved chars 
Refs #22141
 2015-05-13 02:17:54 -06:00
Mike Place
45b4015d7d Handle exceptions raised by __virtual__ 
Closes #23452
 2015-05-13 01:27:17 -06:00
Mike Place
f6fcf19a7f Convert str master to list 
Closes #23611
 2015-05-13 01:06:28 -06:00
Thomas S Hatch
f20c0e42ce Merge pull request #23595 from rallytime/bp-23549 
Backport #23549 to 2014.7
 2015-05-12 15:19:40 -06:00
Thomas S Hatch
1acaf86da7 Merge pull request #23594 from rallytime/bp-23496 
Backport #23496 to 2014.7
 2015-05-12 15:19:34 -06:00
Thomas S Hatch
2c221c7332 Merge pull request #23593 from rallytime/bp-23442 
Backport #23442 to 2014.7
 2015-05-12 15:19:26 -06:00
Thomas S Hatch
fadd1ef63c Merge pull request #23606 from twangboy/fix_installer 
Fixed checkbox for starting service and actually starting it
 2015-05-12 15:18:50 -06:00
twangboy
038331edab Fixed checkbox for starting service and actually starting it 2015-05-12 18:04:42 +00:00