valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
38,443 Commits 24 Branches 182 Tags 341 MiB
78fc0f8799
Commit Graph

38443 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas S Hatch
1c23c1f784 Merge pull request #21360 from terminalmage/issue21300 
Fix traceback in sysctl.present state output
 2015-03-06 08:45:41 -07:00
Thomas S Hatch
00323f03d0 Merge pull request #21366 from d--j/fix-debian-ip-dns-nameservers 
Make debian_ip.get_interface not remove dns-nameservers
 2015-03-06 08:43:18 -07:00
Spiros Ioannou
15c371d02a correct string for microsoft and vmware 2015-03-06 16:37:37 +02:00
Spiros Ioannou
9d4fcdd34c better grains.virtual through systemd-detect-virt and virt-what, fixes issue #21218 2015-03-06 16:24:36 +02:00
Daniel Jagszent
32c7547de2 Make debian_ip not remove dns-nameservers 
Do not translate debian style attributes to salt style attributes in
_parse_interfaces. The `iface_dict` expects the debian style
attribute names anyway.

Fixes #18318 (in 2014.7 and up, the part of missing options, not the
removing coments part)
 2015-03-06 02:13:38 +01:00
Erik Johnson
13221816cc Fix traceback in sysctl.present state output 
Also fixed a lot of line > 79 columns issues.

Resolves #21300.
 2015-03-05 14:11:16 -07:00
Ronald van Zantvoort
6327479a03 Fix for comments containing whitespaces 
When comments contain whitespaces they won't be copied over currently.
This is because the split keeps splitting along the whitespaces.

Reproduce:
```
name = "ecdsa-sha2-nistp256 awesomlylongkey= The Loeki proposes a fix for this"
```
 2015-03-05 19:35:02 +01:00
Marvin Frick
fc7ee455fb * fixes states.network bonding for debian 
* remove duplicate 'mode' from bridge as well

* fixes output for bond slave interfaces

* fixes minor typo

* fixes bonding example

--
Squashed working commits into one PR commit
 2015-03-05 12:19:26 +01:00
jfindlay
a5a14ffd6f Merge pull request #21308 from s0undt3ch/2014.7 
[2014.7] Update the bootstrap script to latest stable v2015.03.04
 2015-03-04 11:01:03 -07:00
Pedro Algarvio
26f07a01bc Update the bootstrap script to latest stable v2015.03.04 
* Fix the salt package selection on Arch stable installs
 2015-03-04 16:44:11 +00:00
Alexander J. Trentini
1c636bafd8 Fixes #21114 [2/2]; keystone.user_present fails to remove user-roles 2015-03-04 17:31:06 +01:00
Alexander J. Trentini
72b719f13c Fixes #21114 [1/2]; keystone.user_present fails to create user-roles for more 
than 1 tenant/user
 2015-03-04 17:30:32 +01:00
Mike Place
07759668a7 Merge pull request #21302 from nmadhok/add-src-gitignore 
Adding src folder to .gitignore
 2015-03-04 08:39:48 -07:00
Nicole Thomas
b86ed66489 Merge pull request #21269 from RobertFach/fix-21215-mount-superopts 
fixed issue which causes mount.mounted to fail when superopts are not pa...
 2015-03-04 08:36:32 -07:00
Nitin Madhok
67c1c4a00a Adding src folder to .gitignore 2015-03-04 09:09:54 -05:00
jfindlay
ce4d97fa92 Merge pull request #21289 from hvnsweeting/2014.7 
do not log at error lvl for ssh-keygen check command
 2015-03-03 23:23:40 -07:00
Viet Hung Nguyen
fa10a97488 do not log at error lvl for check command 2015-03-04 11:22:25 +07:00
jfindlay
da6eb8b6bb Merge pull request #21275 from terminalmage/fix-invalid-kwargs 
Fix invalid kwarg output
 2015-03-03 14:13:47 -07:00
Erik Johnson
9e8ce470b7 Fix invalid kwarg output 
The str.format()'ed dictionary representation of the invalid kwargs
dict. This commit adds key=val pairs for each bad kwarg, making the
output for the exception that is raised look a lot nicer.
 2015-03-03 10:00:12 -07:00
Thomas S Hatch
8379e5107e Merge pull request #21050 from lorengordon/fix-file-search-regression 
Fix file.replace regressions, fixes saltstack#20970 and saltstack#20603
 2015-03-03 09:42:02 -07:00
Thomas S Hatch
aa03bac6ca Merge pull request #21253 from freimer/issue_21057_2014.7 
Fix for Python (Win32) without a signal.SIGKILL
 2015-03-03 09:38:49 -07:00
Thomas S Hatch
8e63572857 Merge pull request #21242 from jfindlay/cmd_tests 
indent quoted code in cmdmod tests
 2015-03-03 09:37:35 -07:00
Robert Fach
86852e5722 fixed issue which causes mount.mounted to fail when superopts are not part of mount.active (extended=True), this fix will also fix potential problems with Solaris and FreeBSD 2015-03-03 16:31:19 +00:00
Fred Reimer
580afe7551
Fix for Python (Win32) without a signal.SIGKILL 2015-03-03 07:13:13 -05:00
Pedro Algarvio
5f3b81887d Merge pull request #21182 from ndenev/2014.7 
Make sure tmp_dir does not end in a slash, and remove extra escapes.
 2015-03-03 01:02:10 +00:00
Justin Findlay
a6b86ef627 indent quoted code in cmdmod tests 2015-03-02 16:08:49 -07:00
Nikolay Denev
d243c3639d Merge remote-tracking branch 'upstream/2014.7' into 2014.7 2015-03-02 15:20:05 +01:00
Loren Gordon
5bcf157368 Check file before making changes, create backup only if necessary 
Re-add the fixes where the file is not modified if no changes are made,
and the backup is created only if changes are made.
 2015-03-02 08:58:36 -05:00
David Boucha
b586f0761e convert datetime objects to strings 
so msgpack doesn't blow up
 2015-03-02 10:24:39 +01:00
Seth House
14af3e93a3 Improved presence docs; added cross-references and localhost caveat 
Closes #18436.
 2015-03-02 10:24:38 +01:00
Nikolay Denev
026bd1baf9 Consistently escape tmp_dir where it's used in root_cmd(). 
Also use single quotes to avoid problems with shells like tcsh which
don't seem to like double quotes.
 2015-03-02 10:22:14 +01:00
Thomas S Hatch
6577a2024e Merge pull request #21200 from UtahDave/2014.7local 
Cherry pick back to 2014.7 branch - convert datetime objects to strings
 2015-03-01 21:06:02 -07:00
David Boucha
fc1c17b8dc convert datetime objects to strings 
so msgpack doesn't blow up
 2015-03-01 17:11:00 -07:00
Nicole Thomas
0eaaf87eec Merge pull request #21179 from whiteinge/doc-presence-cross-ref-localhost-prob 
Improved presence docs; added cross-references and localhost caveat
 2015-03-01 09:40:44 -07:00
Nikolay Denev
e857425b56 - Make sure tmp_dir does not end in a slash. 
- Avoid escaping tmp_dir as this causes issues on FreeBSD's tcsh shell
  (default for root). Also this is more consistent with rest of the code
  where tmp_dir is not escaped.
 2015-03-01 12:19:19 +01:00
Seth House
4d974d9676 Improved presence docs; added cross-references and localhost caveat 
Closes #18436.
 2015-02-28 19:22:38 -07:00
C. R. Oldham
d19937eca2 Add docs for linode cloud driver 2015-02-28 12:23:22 -07:00
C. R. Oldham
f87cb72f40 Update linode salt-cloud driver to support using either linode-python or apache-libcloud 2015-02-28 12:20:21 -07:00
Pedro Algarvio
5bbc21f3c2 Merge pull request #21125 from jfindlay/cmd_tests 
add cmd module integration tests
 2015-02-28 16:24:42 +00:00
Nicole Thomas
36776e7cfa Merge pull request #21151 from s0undt3ch/2014.7 
[2014.7] Update bootstrap script to latest stable, v2015.02.28
 2015-02-28 09:04:41 -07:00
Pedro Algarvio
0e5adace27 Update bootstrap script to latest stable, v2015.02.28 
* Fix Debian backports repository.
 2015-02-28 15:10:20 +00:00
Justin Findlay
17b8f73f1b add cmd module integration tests 2015-02-27 16:30:05 -07:00
Thomas S Hatch
a3bd5f6693 Merge pull request #21103 from s0undt3ch/2014.7 
[2014.7] Update the bootstrap script to latest stable v2015.02.27
 2015-02-26 21:13:44 -07:00
Pedro Algarvio
6248c6e133 Update the bootstrap script to latest stable v2015.02.27 
* Try other tools besides wget when downloading the COPR repo file. Thanks Ronald van Zantvoort(The-Loeki)
* No need to install packages from the Unstable repository for debian, use backports. Thanks Ari Aosved(devaos)
* Fix an issue in CentOS where the syndic package wasn't being installed(since it's now a separate package). Thanks Ronald van Zantvoort(The-Loeki)
* Enable the server-optionals repository for RHEL >= 7
* RHEL/CentOS 5 now uses the COPR repository. #533
 2015-02-27 01:48:29 +00:00
Thomas S Hatch
1efcf4007f Merge pull request #21095 from jond64/fix-for-21039 
Fix for #21039
 2015-02-26 18:10:01 -07:00
jond64
0a0f3f91dd Fix for #21039 2015-02-26 15:54:44 -06:00
Thomas S Hatch
7892d62620 Merge pull request #21058 from terminalmage/fix-chocolatey-0.9.9 
Support Chocolatey 0.9.9+
 2015-02-26 11:08:38 -07:00
Thomas S Hatch
4d47b17d65 Merge pull request #21070 from RobertFach/fix-21067-mount-user-parameter 
fixed issue where user option is internally transformed to username whic...
 2015-02-26 11:07:54 -07:00
Thomas S Hatch
f735a35775 Merge pull request #21076 from RobertFach/fix-21043-lvm-invalid-change-data 
fixed invalid changes data issue
 2015-02-26 10:49:00 -07:00
Thomas S Hatch
84a20d77fd Merge pull request #21077 from terminalmage/add-bootstrap 
Add missing function config.gather_bootstrap_script
 2015-02-26 10:48:40 -07:00