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
56,518 Commits 24 Branches 182 Tags 341 MiB
63b195987e
Commit Graph

56518 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Woods
63b195987e Fix forward-merged caching from 2015.5 into 2015.8 to be compatible with the new match_func 2015-08-18 14:37:23 +01:00
Colton Myers
1c661abc91 Skip failing event tests 
@driskell it would be great if you could fix these up when you do your
2015.8 refactor
 2015-08-12 10:15:11 -06:00
Colton Myers
426b1631c6 Remove stray subscribe 2015-08-11 23:12:18 -06:00
Colton Myers
a7fcc49911 connect_pub call replaces subscribe call 2015-08-11 23:10:47 -06:00
Colton Myers
4e35a0ee01 Use list comp instead of filter (py3 compat) 2015-08-11 23:02:09 -06:00
Colton Myers
1502a39779 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    conf/minion
    salt/client/__init__.py
    salt/states/dockerio.py
    salt/utils/event.py
    tests/unit/utils/event_test.py
 2015-08-11 18:12:21 -06:00
Mike Place
1492a14ea5 Merge pull request #26221 from sjorge/smartos-grains 
SmartOS grain fixes
 2015-08-11 15:45:14 -06:00
Jorge Schrauwen
22acfa1320 fix ip adres issues on SunOS/SmartOS 2015-08-11 20:59:19 +00:00
Mike Place
8e992f23d0 Merge pull request #26218 from terminalmage/issue4699 
Add warning about file.recurse unicode errors with vim swap files.
 2015-08-11 14:21:08 -06:00
Erik Johnson
9c155e0c1a Add warning about file.recurse unicode errors with vim swap files. 
Fixes #4699.
 2015-08-11 15:16:44 -05:00
Jorge Schrauwen
06df3ef7c1 SunOS should use isainfo to figureout osarch. 
Info from isainfo manpage
       -k
             Prints the name of the instruction set(s) used by the
operating
             system kernel components such as device drivers and STREAMS
             modules.
 2015-08-11 18:36:11 +00:00
Justin Findlay
d69f50e848 Merge pull request #26214 from rallytime/bp-24878 
Back-port #24878 to 2015.8
 2015-08-11 12:27:59 -06:00
Jorge Schrauwen
749cc419ec Just skip the smbios stuff on SmartOS regardless, even if smbios works 
in the global zone, it is not compatible!

Usage: smbios [-BeOsx] [-i id] [-t type] [-w file] [file]

        -B disable header validation for broken BIOSes
        -e display SMBIOS entry point information
        -i display only the specified structure
        -O display obsolete structure types
        -s display only a summary of structure identifiers and types
        -t display only the specified structure type
        -w write the raw data to the specified file
        -x display raw data for structures
 2015-08-11 18:23:30 +00:00
Jorge Schrauwen
ccd400a2f6 skip smbios grains on SmartOS when inside a zone 2015-08-11 18:14:17 +00:00
Jorge Schrauwen
cf74e49fca tweak smartos release info 2015-08-11 17:49:34 +00:00
Seth House
4471c3f237 Add note about top-file only env assignment and the show_top() function 2015-08-11 11:29:33 -06:00
Seth House
5864111429 Minor spelling, style fixes 2015-08-11 11:29:25 -06:00
Mike Place
8ad37e0558 Remove debugger 2015-08-11 11:29:19 -06:00
Mike Place
05c21297de Fix env ordering in merged list 2015-08-11 11:29:13 -06:00
Mike Place
a5522f1581 Removed incorrect default config 2015-08-11 11:29:06 -06:00
Mike Place
8ca0e59891 Lint 2015-08-11 11:28:59 -06:00
Mike Place
845d26f45e Add top_file_merging_strategy to mopts 2015-08-11 11:28:54 -06:00
Mike Place
c76084a960 Compare against client_env if that resolves 2015-08-11 11:28:47 -06:00
Mike Place
cfb6982227 Adding some dictupdate merge tests 
Add new option for top_file_merging_strategy to config

Add master config file option

Adding additional tests

Lexicographical test works

Make default strategy

Simplify to just an option about whether or not to merge

Changes

Implement ordered top files

Implement merge strategies and default top files

Lint

Doc rewrite and start on ordering

Remove debugging

Moving to env_order

Adding env_order

Still writing tests

More tests and docs
 2015-08-11 11:28:40 -06:00
Mike Place
1c31722b49 Merge pull request #26211 from techhat/movespm 
Move SPM to its own directory
 2015-08-11 11:23:59 -06:00
Joseph Hall
176fa12d51 Move SPM to its own directory 2015-08-11 10:24:55 -06:00
Erik Johnson
8edc0d82c6 Merge pull request #26197 from TronPaul/gitfs-whitelist-base-fix 
Fix GitFS when whitelisting base
 2015-08-11 11:06:09 -05:00
Mike Place
b996cf41b1 Merge pull request #26200 from alprs/fix-salt_cloud_current_user 
Make it possible to run salt-cloud as current user
 2015-08-11 09:01:44 -06:00
Mike Place
82caf52497 Merge pull request #26201 from kev009/fbsd-disks-fix 
Avoid VBOX storage emulation bugs in FreeBSD disks grain
 2015-08-11 08:40:35 -06:00
Kevin Bowling
ded9f78ec0 Cache the VBOX check so we don't have to spawn another camcontrol for each disk 2015-08-11 01:50:19 -07:00
Kevin Bowling
2a24f8b768 Avoid VBOX storage emulation bugs in FreeBSD disks grain 2015-08-11 01:42:03 -07:00
Andreas Lutro
0f985e9883 salt-cloud: None means run as current user 2015-08-11 09:33:23 +02:00
Justin Findlay
7e58ee88dc Merge pull request #26188 from basepi/merge-forward-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2015-08-10 22:17:59 -06:00
Mark McGuire
f3c1965785 Fix GitFS when whitelisting base 
- deconflate ref and env in every implementation of GitFS get_tree
 2015-08-10 22:47:30 -05:00
Mike Place
b72207f1c6 Merge pull request #26194 from basepi/fix.virt.grain.26121 
Allow virtual grains to be generated even if virt-what is not available
 2015-08-10 18:47:59 -06:00
Colton Myers
ed74766070 Allow virtual grains to be generated even if virt-what is not available 
Also normalized _cmds to be a list. The set() functionality wasn't
actually being used, we were just overwriting it with a list. Sets are
also unordered, which is a problem for a list of commands we want to run
in order.

Fixes #26121
 2015-08-10 17:17:59 -06:00
Colton Myers
49fb19049b Remove outdated heavily-mocked unit test 2015-08-10 16:54:17 -06:00
Mike Place
b57da552ff Merge pull request #26084 from twangboy/fix_25802 
Added python_shell=True, quoted user input
 2015-08-10 15:29:35 -06:00
Colton Myers
49cfd3d54e Remove out of date code 2015-08-10 15:24:55 -06:00
Colton Myers
cccad1fc27 py3 compat 2015-08-10 15:22:43 -06:00
twangboy
4503ed5b34 Fixed but with multiple packages, was causing tests to fail 2015-08-10 13:36:53 -06:00
twangboy
f05e3e72a3 Merge branch '2015.5' of https://github.com/saltstack/salt into fix_25802 2015-08-10 13:36:02 -06:00
Colton Myers
aa19e20d43 Remove code that shouldn't have merged forward 2015-08-10 13:23:25 -06:00
Colton Myers
0fc16040d6 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/topics/cloud/vmware.rst
    salt/cloud/__init__.py
    salt/cloud/clouds/vmware.py
    salt/loader.py
    salt/minion.py
    salt/modules/archive.py
    salt/modules/file.py
    salt/states/pkg.py
    salt/utils/http.py
 2015-08-10 13:21:57 -06:00
Mike Place
c3814137a3 Merge pull request #26183 from cro/anonldap2 
Fix LDAP configuration issue.
 2015-08-10 13:09:41 -06:00
Justin Findlay
3233ed4675 Merge pull request #26186 from jacobhammons/man-page-updates 
regenerated man pages
 2015-08-10 13:07:44 -06:00
Justin Findlay
d48bcf7598 Merge pull request #26182 from basepi/merge-forward-2015.5 
[2015.5] Merge forward from 2014.7 to 2015.5
 2015-08-10 13:00:10 -06:00
Mike Place
f39780f8ce Merge pull request #26000 from driskell/fix_discarded_events 
Implement full event caching for subscribed tags
 2015-08-10 12:57:17 -06:00
C. R. Oldham
aa5e9c80b5 Lint roller 2015-08-10 12:53:23 -06:00
Mike Place
c01b4cf150 Merge pull request #26175 from rallytime/bp-26153 
Back-port #26153 to 2015.5
 2015-08-10 12:22:32 -06:00