Removed debug stuff
Merge pull request #16228 from SmithSamuelM/2014.7_sam5

Fixed issue where new timing for cli broke raetevent
avoid creating unparseable lxc config param: lxc.network.mac
lxc module: don't reinvent the wheel -- use lxc-attach built-in args for env and use pipes.quote instead of manual quoting
added comment
Add unity manpage to buildpackage spec

This fixes automated package builds in jenkins
Merge pull request #16232 from terminalmage/unity-manpage

Add unity manpage to buildpackage spec
Merge pull request #16187 from nmadhok/file-copy-state-preserve

Adding preserve option to salt.states.file.copy to be able to preserve ownership and mode
Merge pull request #16226 from thatch45/2014.7

First fix for #16106
Merge pull request #16224 from thatch45/keygen_fallback

If the minion keypair does not exist, generate it
Merge pull request #16231 from rallytime/bp-16144

Backport #16144 to 2014.7
pub_sig to pubkey_sign so that the tutorial isnt broken in /doc/topics/tutorials/multimaster_pki.rst
Merge pull request #16236 from Snergster/fix-tutorial-doc-config

pub_sig to pubkey_sign so that the tutorial isnt broken in /doc/topics/t...
Make renderers fully aware of pillar context
Merge branch '2014.7' into develop
Merge pull request #16193 from thatch45/SmithSamuelM-2014.7_sam4

Merge #16177
Update 'doc/.tx/config' - Build #166

  http://cookingwithsalt.org/job/salt/job/transifex/166/

Signed-off-by: Pedro Algarvio <pedro@algarvio.me>
fix for #16240

This just exposes a but in the event class where the nonblocking function doesn't check if you have subscribed yet or not
Start listening for returns before firing off the ping
Add note on how to set pillar data on the command line to pillar tutorial

Closes #14217