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
75,900 Commits 24 Branches 182 Tags 341 MiB
27c532b34c
Commit Graph

75900 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
twangboy
c4e36b3585 Fix some lint 2016-11-11 08:24:38 -07:00
Super-User
a2ef1e0b16 zoneadm.move and zoneadm.verify 2016-11-11 15:21:29 +01:00
Super-User
1530678def zoneadm.ready, zoneadm.* improve error handling 2016-11-11 15:06:47 +01:00
Super-User
a317c3acb4 zoneadm.attach and zoneadm.detach 2016-11-11 14:30:51 +01:00
Mike Place
737436a463 Merge pull request #37146 from cachedout/master_pub_error_reporting 
Master publish error reporting
 2016-11-11 22:52:31 +13:00
Mike Place
40b2459638 Merge pull request #37631 from SolarisYan/patch-2 
if password in profile,not overwrite it
 2016-11-11 22:50:27 +13:00
Mike Place
4c07b3534a Merge pull request #37629 from TronPaul/fix-s3fs-opts 
fix __opts__ and provider being None in salt.utils.aws:get_location
 2016-11-11 22:49:47 +13:00
Mike Place
7f13513c05 Merge pull request #37630 from skizunov/develop2 
Add `info_installed` function to opkg module
 2016-11-11 22:46:47 +13:00
SolarisYan
a59b07bf71 if password in profile,not overwrite it 
if user provide password in profile,we shouldn't overwrite it
 2016-11-11 13:03:48 +08:00
Mike Place
200d9fcb6e Merge pull request #37481 from thatch45/raet_client 
Raet internal client reference fix
 2016-11-11 17:39:41 +13:00
Sergey Kizunov
d97d857d39 Add info_installed function to opkg module 
This is based on the `info_installed` function in the `zypper` module
in that it accepts an optional extra `attr` kwarg.

One extra feature it has is that it will return information on all
packages if no `names` are specified.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
 2016-11-10 22:31:14 -06:00
Mark McGuire
a452cded20 fix __opts__ and provider being None issue 2016-11-10 21:22:33 -06:00
Mike Place
b14faf1c68 Merge pull request #37611 from jeanpralo/fix-cmd-batch-raw 
Fix cmd batch raw
 2016-11-11 15:53:58 +13:00
Mike Place
35c8333d04 Merge pull request #37614 from gtmanfred/2016.3 
remove redundant code
 2016-11-11 15:49:13 +13:00
Mike Place
4fab707bdd Merge pull request #37627 from cachedout/pr-36706 
Exempt pip.iteritems from test_valid_docs test
 2016-11-11 15:48:37 +13:00
Mike Place
94df2f8e6f
Exempt pip.iteritems from test_valid_docs test 2016-11-11 15:47:43 +13:00
Mike Place
ee74f3116e Merge pull request #36706 from siccrusher/fix_env_var_validation 
Add basic sanity checks for env_vars in pip.install function
 2016-11-11 15:47:16 +13:00
Mike Place
902a97575e Merge pull request #37626 from cachedout/issue_37491 
Exit with proper retcode on hard client failures
 2016-11-11 15:38:47 +13:00
Mike Place
2c2dc93640
Fix test and check for jid not in pub_data 2016-11-11 15:37:47 +13:00
Mike Place
9d207c0224 Merge pull request #37607 from techhat/badstatusline 
Try the connection again, in case it's been reset
 2016-11-11 14:59:46 +13:00
Mike Place
9751e19b61 Merge pull request #37615 from eradman/vmware 
vmware: optionally allow network interface MAC to be set
 2016-11-11 14:58:17 +13:00
Mike Place
845f835177 Merge pull request #37617 from terminalmage/git_pillar-docs 
Clarify docs for git_pillar dynamic env feature
 2016-11-11 14:52:52 +13:00
Mike Place
9af5eb6ab8 Merge pull request #37624 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2016-11-11 14:51:10 +13:00
Jean Praloran
4f16840ef1 add integration test for salt.client.LocalClient.cmd_batch 2016-11-11 14:20:51 +13:00
Mike Place
8e5610667f Merge pull request #37623 from cachedout/issue_37605 
Drop log warning level to debug
 2016-11-11 14:17:25 +13:00
Mike Place
bab9a729b1
Exit with proper retcode on hard client failures 
Closes #37491
 2016-11-11 14:13:29 +13:00
Mike Place
b6031524e5
Return with proper retcodes in batch mode 
Check for the highest retcode received in batch mode and exit with it.

Also, an integration test for the same.

Closes #37492
 2016-11-11 14:03:29 +13:00
Eric Radman
9a60e298bb vmware: optionally allow network interface MAC to be set 
Example profile:

    network:
      Network Adapter 1:
        mac: '00:16:3e:e8:19:0f'
        name: vlan25
        switch_type: standard

This takes effect as soon as the VM is initialized, so PXE-booting can
take advantage of this.
 2016-11-10 19:59:55 -05:00
twangboy
9a9effdfc7 Fix versions report for server OSs 2016-11-10 17:29:03 -07:00
Mike Place
fb27f8b69e Revert change 
This was a totally incorrect change made by me. My fault. Apologies.
 2016-11-11 12:58:39 +13:00
rallytime
4c245a3fa5 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/modules/x509.py
 2016-11-10 16:51:52 -07:00
Mike Place
3079d78332 Merge pull request #36627 from sjmh/fix/auth_skip_nomatch 
Skip rest of loop on failed func match
 2016-11-11 12:47:12 +13:00
Mike Place
369653c08d
Drop log warning level to debug 
If we set this to info, it will appear on systems on every grains load. This affects
things like salt-call on every invocation. It's not sensible to throw this warning
in a CLI utility, especially on systems which may have a valid reason for being
configured in this manner. Either way, it shouldn't be the job of Salt to warn
people of this condition.

Refs #33934

Closes #37506
 2016-11-11 12:31:26 +13:00
Mike Place
9e253c9663 Disable pylint warning 2016-11-11 12:23:59 +13:00
rallytime
7b2341bbfd Merge branch '2016.11' into 'develop' 
Conflicts:
  - doc/topics/releases/releasecandidate.rst
  - salt/modules/file.py
  - salt/states/file.py
  - salt/utils/network.py
 2016-11-10 15:59:51 -07:00
Nicole Thomas
8ba9ceda50 Merge pull request #37609 from rallytime/merge-2016.11 
[2016.11] Merge forward from carbon to 2016.11
 2016-11-10 15:48:43 -07:00
Erik Johnson
8cdf5dbb51 Clarify docs for git_pillar dynamic env feature 2016-11-10 16:41:51 -06:00
Daniel Wallace
71c2df89a9 remove redundent code 2016-11-10 16:34:21 -06:00
Mike Place
1492b1a114 Merge pull request #37583 from Mrten/patch-1 
Add a section to the manual for the sqlite3 state that hints to module.run
 2016-11-11 10:59:55 +13:00
Mike Place
f728977346 Merge pull request #37593 from skizunov/develop2 
Make sure grains hw values are clean
 2016-11-11 10:57:37 +13:00
Mike Place
fb763d91e8 Merge pull request #37594 from rallytime/fix-35381-develop 
Don't completely replace grains dict when getting virtual data
 2016-11-11 10:54:35 +13:00
Mike Place
a71e7c77b3 Merge pull request #37600 from mcalmer/fix-timezone-on-SUSE 
change TIMEZONE on SUSE systems (bsc#1008933)
 2016-11-11 10:54:04 +13:00
Mike Place
39b75878cf Merge pull request #37602 from DSRCorporation/bugs/37238_salt_hang_on_master_restart 
Handle master restart in appropriate places using `salt.event` listener.
 2016-11-11 10:53:20 +13:00
Jean Praloran
ead47e4bba update ret dict to avoid hanging 2016-11-11 10:53:07 +13:00
Jean Praloran
0a2f153b6e fix dict key for raw support to avoid exception 2016-11-11 10:52:31 +13:00
Mike Place
403b469aea Merge pull request #37601 from eradman/random_org 
Skip random.org tests for any communication failure
 2016-11-11 10:52:25 +13:00
Mike Place
1b0f428116 Lint fix 2016-11-11 10:49:45 +13:00
Mike Place
019e1a721b Merge pull request #37608 from gtmanfred/2016.3 
allow multiline returns from docker for mac
 2016-11-11 10:48:59 +13:00
Nicole Thomas
7b00656d26 Merge pull request #18 from terminalmage/merge-2016.11 
Raise exception, and also fix error with call to str.format()
 2016-11-10 14:46:37 -07:00
Erik Johnson
3c51a67895 Raise exception, and also fix error with call to str.format() 2016-11-10 15:44:38 -06:00