Add docs for roster_file option
Merge pull request #15552 from thatch45/roster_master_config

Add docs for roster_file option
Adding optional tag functionality to salt.modules.dockerio.push
Adding optional tag in salt.states.dockerio.pushed
Merge branch '2014.7' into develop
fix str.format() call in modules.boto_elb.deregister_instances

************* Module salt.modules.boto_elb
salt/modules/boto_elb.py:585: [E1306(too-few-format-args), deregister_instances] Not enough arguments for format string
Merge pull request #15501 from highlyunavailable/2014.7

Change getBareMetalInstances call to getHardware
fix refactoring error in client.ssh.Single.sls_seed

salt/client/ssh/__init__.py:929: [E1305(too-many-format-args), Single.sls_seed] Too many arguments for format string
ENH: Updated modules.pip.upgrade function to only upgrade packages which are out-of-date
Add buildpackage.py
Generate random cloud instance name on rackspace tests
Add spec file for git builds
Update formulas.rst code blocks
Don't log the password on ldap auth failure

Fixes #15551
Merge pull request #15553 from basepi/bp-15516

Backport #15516 to 2014.7
Merge branch '2014.7' into develop
make logger global for buildpackage.py
Generate random cloud provider names on digital ocean
Merge pull request #15559 from nmadhok/patch-1

Update formulas.rst code blocks
Use the first parent on git describe when available.

This is necessary since we now merge forward and git describe thinks the
HEAD with the less commits is the HEAD to use.

A little more information about this behaviour can be found here:

  http://www.xerxesb.com/2010/git-describe-and-the-tale-of-the-wrong-commits/