modify a sentence for more accurate
Merge pull request #5316 from yinchuan/patch-1

modify a sentence for more accurate
Fix a bug in linux GPU vendor searches. With Intel integrated graphics, this function would return 'ati' as the vendor name because 'ati' was in the string Intel Corporation. Change the search to look at a list of strings to match a vendor name. This should work with any of the known vendors at this point in time.
Merge pull request #5320 from zmarano/gpu_fix

Fixes issue 5058: Fix a bug in linux GPU vendor searches. With Intel integrated graphics, ...
pkg/smartos : fix the manifest of salt-master to start@boot
Add refresh arg to group.getent()
Add refresh option to the other group.getent() instances
Enumerate removed groups in user.absent state, Fix #5310
modules/smartos_vmadm : add setmem(uuid, memory) function

This function identifies the VM type (OS -> realtime update, or KVM ->
reboot), and sets the correct amount of memory. Warning : there are no
checks against the CN : you could accidentally permit the VM to eat all
the RAM available on the baremetal...
modules/smartos_vmadm : fix a missing variable reference
Merge pull request #5321 from virtua-network/fix_smartos

pkg/smartos : fix the manifest of salt-master to start@boot
Merge pull request #5325 from virtua-network/smartos_vmadm

modules/smartos_vmadm : add setmem(uuid, memory) function
Access the group data correctly (it was reformatted)
Actually format the string so it's useful
Merge pull request #5326 from basepi/userdel5310

Enumerate removed groups in user.absent state, Fix #5310
[UPDATE] fixed multi/single bucket per env in S3
[WIP] Cleaned up the comments and a few messy bits
[UPDATE] Refactored to allow multi/single env buckets

Also refactored out some duplicate code and cleaned up the comments and
flow quite a bit. Still need to implement the file_emptydir_list
[UPDATE] a refactor + fixed tuple bug in hashing

Stupid stupid stupid tuple bug
[UPDATE] more refactoring + switched cached dirs

Switched cache dirs around so it's <env>/<bucket>/<s3 path>/<file>