Adding preserve option to salt.states.file.copy to be able to preserve ownership and mode
Merge branch '2014.7_sam4' of https://github.com/SmithSamuelM/salt into SmithSamuelM-2014.7_sam4
Lint 1
lint 2
Merge remote-tracking branch 'upstream/2014.7' into 2014.7_sam4
Merge pull request #16177 from SmithSamuelM/2014.7_sam4

Clean up RAETChannel changes to support different usages
RST formatting fixes
BUG: Bugfix to handle branch without remote and missing fetch for new remote in git.latest
Fixing lint violation
Merge pull request #16199 from terminalmage/docs

RST formatting fixes
add some help using an interactive cli debugger

when hacking some tricky code i find using ipython productive.
using ipython

small fix
Update modular_systems.rst
Merge branch 'doc_debug' of https://github.com/steverweber/salt into steverweber-doc_debug
Merge branch 'steverweber-doc_debug' into develop
Adding two new grains, one to show only the ipv4 addresses for each interface and another to show only the ipv6 address for each interface.
Get rid of Micro Instance examples
Spelling and formatting fixes
adding maxdepth and mindepth functionality to find function in the file module.
Merge pull request #16203 from techhat/microinstance

Get rid of Micro Instance examples