made copying the environment safe
Fix #15170 - keep comments within the hosts file
Merge pull request #1 from saltstack/develop

Pull from #based overlords 2014-08-28
Added mdadm assemble module function
Added mdadm assemble handling to the mdadm state
Fixed how I was interpreting the return status of mdadm -E with cmd.run
Fixed bug where raid.save_config would break if mdadm.conf weren't present
Hide `concurrent` arg for state.sls

This arg should almost never be used, so I don't think it should be
featured in the function signature.  It remains documented in the
docstring, but with a giant warning below it.
Document multiple file.managed sources
Remove references to masterless salt from gitfs docs

Alternate backends do not yet work with the local fileclient.
Clarify a point about runners and eauth
Typo
mdadm -E is checked with cmd.retcode instead and we now check if devices are a
mix of RAID and non-RAID
Merge pull request #15450 from cachedout/file_managed_list

Document multiple file.managed sources
Merge pull request #15453 from terminalmage/remove-masterless-examples

Remove references to masterless salt from gitfs docs
Merge pull request #15456 from cachedout/eauth_clarify

Clarify a point about runners and eauth
Merge branch '15170-keep-comments' of https://github.com/dmyerscough/salt into dmyerscough-15170-keep-comments
Fix tests for new changes from PR #15217
Add metadata optio to the parser
Use the metadata option to display the full ret