Aditya Kulkarni
57f56ef190
Quote proxyname
2015-11-18 15:46:44 -05:00
Aditya Kulkarni
1f6ec23e92
Add state function
2015-11-18 14:35:56 -05:00
Aditya Kulkarni
e2cf9e48a0
Add function to write conf file
2015-11-18 13:22:32 -05:00
Aditya Kulkarni
f576fc39cd
Add state for salt proxy
2015-11-18 12:32:28 -05:00
Mike Place
16ebda999e
Merge pull request #28889 from jfindlay/aggregate
...
state compiler: relax aggregate conditional check
2015-11-16 10:39:24 -07:00
Mike Place
91a327bbce
Merge pull request #28921 from rallytime/bp-25470
...
Back-port #25470 to 2015.8
2015-11-16 10:38:59 -07:00
Mike Place
3707eb1e7c
Merge pull request #28922 from rallytime/release-notes-ver
...
Change 2015.8.2 release note title to reflect proper version
2015-11-16 09:47:33 -07:00
rallytime
61029f8db1
Change 2015.8.2 release note title to reflect proper version
2015-11-16 09:44:58 -07:00
rallytime
a5eee74c20
Change Beryllium to 2015.8.3 release
2015-11-16 09:38:04 -07:00
Justin Findlay
5ce61abf57
rewrite GPG unit tests
2015-11-16 09:36:29 -07:00
Justin Findlay
7aa424209e
reduce globals in GPG renderer for easier testing
2015-11-16 09:36:29 -07:00
Justin Findlay
de5b6682ef
log error and return ciphered txt on decrypt error
2015-11-16 09:36:10 -07:00
Christer Edwards
6afb344fe3
updated logic to properly detect GPG_KEYDIR path
2015-11-16 09:35:17 -07:00
Christer Edwards
bc9750b85e
refactor gpg renderer; removing dependency on python-gnupg
2015-11-16 09:35:17 -07:00
Mike Place
23eae0d9e0
Merge pull request #28891 from jfindlay/chkconfig_check
...
rh_service module: fix logic in _chkconfig_is_enabled
2015-11-15 19:44:14 -07:00
Mike Place
8e6acd97ae
Merge pull request #28892 from jfindlay/sles_grain
...
grains.core: correctly identify SLES 11 distrib_id
2015-11-15 19:30:30 -07:00
Mike Place
cf929c3847
Merge pull request #28910 from lorengordon/patch-1
...
Fix winrepo command in windows pkg mgmt doc
2015-11-15 19:29:12 -07:00
Loren Gordon
64655398b3
Fix winrepo command in windows pkg mgmt doc
2015-11-15 20:03:46 -05:00
Justin Findlay
7a4fb9a790
Merge pull request #28896 from rallytime/bp-28855
...
Back-port #28855 to 2015.8
2015-11-14 17:43:15 -07:00
Justin Findlay
64dc3c23e0
Merge pull request #28895 from rallytime/bp-28823
...
Back-port #28823 to 2015.8
2015-11-14 17:43:07 -07:00
Theo Chatzimichos
baf238f270
fix the os grain in sle11sp4 to be SUSE instead of SLES
...
due to the existence of /etc/os-release on SLE11SP4, the os grain between
SLE11SP3 and SLE11SP4 was different (SLES vs SUSE). Thus, it was falsely trying
to use systemd on SLE11SP4 to start services
2015-11-14 08:13:41 -07:00
Theo Chatzimichos
d167a6b83d
Add support for priority and humanname in pkrepo zypper backend
...
humanname is zypper ar --name
priority is zypper mr -p
both are quite important arguments for setting zypper repositories that were
silently ignored. This commit introduces support on them so that pkgrepo will
properly act on them
Signed-off-by: Marcus Rueckert <mrueckert@suse.com>
Signed-off-by: Bo Maryniuk <bmaryniuk@suse.com>
Signed-off-by: Theo Chatzimichos <tchatzimichos@suse.com>
2015-11-14 08:03:47 -07:00
Justin Findlay
1cfdc500c9
grains.core: correctly identify SLES 11 distrib_id
...
Fixes #24019 .
2015-11-14 00:51:32 -07:00
Justin Findlay
e32a9aab85
rh_service._chkconfig_is_enabled unit tests
2015-11-13 23:38:40 -07:00
Justin Findlay
5a93b7e53c
rh_service module: fix logic in _chkconfig_is_enabled
...
Fixes #23971 .
2015-11-13 23:29:15 -07:00
Justin Findlay
a45ce78e20
Merge pull request #28885 from kt97679/2015.8
...
fix for: service.enabled fails on xen server #28754
2015-11-13 21:55:38 -07:00
Justin Findlay
eb9970019a
state compiler: relax aggregate conditional check
...
Fixes #27961 .
2015-11-13 20:00:07 -07:00
Pedro Algarvio
58b57e77be
Merge pull request #28880 from terminalmage/profile-logging
...
Add "profile" loglevel
2015-11-14 02:07:25 +00:00
Kirill Timofeev
7d0f1f11cb
fix for: service.enabled fails on xen server #28754
2015-11-13 16:24:53 -08:00
Colton Myers
5dc7fccb07
Merge pull request #28882 from basepi/salt-ssh.stacktrace.28881
...
[2015.8] salt-ssh: Check return type to make sure it's an error
2015-11-13 17:14:46 -07:00
Colton Myers
f1a1cad607
Check return type to make sure it's actually an error
2015-11-13 16:18:55 -07:00
Erik Johnson
a62852d407
Add @wraps decorator
2015-11-13 16:48:53 -06:00
Erik Johnson
cac9f17307
Add profile logging for template rendering
2015-11-13 16:47:00 -06:00
Erik Johnson
c625725f70
Add decorator to do profile-level logging for a function
2015-11-13 16:47:00 -06:00
C. R. Oldham
430e9376f6
Merge pull request #28867 from rallytime/fx2-grains-patch
...
[fx2 grains] Grains functions should return dictionaries
2015-11-13 14:14:13 -07:00
Justin Findlay
304072456e
Merge pull request #28863 from mhoogendoorn/fix-issue-28859
...
Fix ebuild.install causing extra refresh_db calls.
2015-11-13 11:46:03 -07:00
rallytime
022cf5d230
[fx2 grains] Grains functions should return dictionaries
2015-11-13 11:15:05 -07:00
Justin Findlay
af297bb0ae
Merge pull request #28865 from jfindlay/2015.8
...
add 2015.8.2 release notes
2015-11-13 10:30:18 -07:00
Justin Findlay
1f847fc9ba
add 2015.8.2 release notes
2015-11-13 10:29:21 -07:00
Erik Johnson
5a2b94ce39
Add "profile" loglevel
2015-11-13 11:14:39 -06:00
Mike Place
15672a3faa
Merge pull request #28730 from garethgreenaway/27392_2015_8_scheduler_return_job_master
...
Fixes to how return_job is handled in the scheduler for the salt master.
2015-11-13 09:58:20 -07:00
Martijn Hoogendoorn
eca09b89a4
Fix ebuild.install causing extra refresh_db calls.
...
Fixes #28859 .
The original call to `latest_version` caused a `refresh_db` to take
place. This is either unneeded (`refresh=True` was passed to `install`
and so refresh_db was done already) or something we were specifically
asked not to do (`refresh=False` was passed to `install`).
2015-11-13 17:29:14 +01:00
Nicole Thomas
5560cb662b
Merge pull request #28848 from cro/fx2_multi_creds
...
Lint
2015-11-13 06:46:36 -07:00
C. R. Oldham
f032bffd7c
Lint
2015-11-12 16:26:05 -07:00
Colton Myers
359e7ca209
fix lint
2015-11-12 16:22:36 -07:00
Colton Myers
089828af9e
Merge branch 'cro' into 2015.8
2015-11-12 16:21:26 -07:00
Colton Myers
6bb6703c3e
Merge branch 'fx2_multi_creds' of git://github.com/cro/salt into cro
2015-11-12 16:20:53 -07:00
C. R. Oldham
3b7d22248c
Fix fallback credentials, add grains based on dracr.server_info and dracr.inventory, fix short-circuited for loop that was preventing retrieval of most data from CMC and DRAC devices, format responses from racadm more clearly.
2015-11-12 14:50:03 -07:00
Mike Place
778ace3ca5
Merge pull request #28842 from cachedout/tcp_shell_test
...
Add transport setting to shell test
2015-11-12 14:43:11 -07:00
Mike Place
785bf94f55
Add transport setting to shell test
2015-11-12 14:32:39 -07:00
