remove extraneous break
Merge pull request #10462 from rallytime/lint_fixes

Missed one lint fix - fixed now
Replace mentions of 0.18.0 with 2014.1.0
Merge pull request #10464 from hulu/remove_mentions_of_0_18_0

Replace mentions of 0.18.0 with 2014.1.0
Merge pull request #10379 from johnnoone/jinja-filter

fix jinja SequenceExtension
Add gitfs "mountpoint" feature, and per-remote root/mountpoint
Add default value for gitfs_mountpoint
Add gitfs_mountpoint master conf parameter to docs
Make file.recurse work with gitfs_mountpoint

When a file.recurse state is specified for salt://foo, and there is a
gitfs_remote mounted at salt://foo/bar, when the fileserver is queried
for the list of directories on the master, 'foo' will not be among them,
causing a pre-flight check to fail and keeping the state from running.
This commit modifies that pre-flight check to also look for paths that
start with 'foo/' as well, allowing salt://foo to be properly matched
when a mountpoint is used.
Added additional docs on gitfs mountpoints and per-remote params
fixed typos: recieved -> received
Merge pull request #10472 from obestwalter/develop

fixed typos: recieved -> received
Allow the new master's minion to answer to local master
Document make master's minion answer to local master.
Allow any of the minions to say they're local
Remove extra space
Add exmaple of any minion responding to local master
Remove first person reference
Merge pull request #10460 from s0undt3ch/hotfix/make-master-local-minion

Allow the new master's minion to answer to local master
Make Pylint ignore file