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
mdadm -E is checked with cmd.retcode instead and we now check if devices are a
mix of RAID and non-RAID
raid.assemble tells you which devices are RAID-ready and which aren't
Fixed a name reference in raid.assemble. Also, raid.assemble sorts the devices
alphabetically if it needs to report that the RAID and non-RAID devices are
mixed
You can pass raid.assemble a comma-separated list of devices now
Resolve issue #15532 set metadata to mdadm
Merge branch 'develop' of https://github.com/saltstack/salt into iss15532
Updated test to account for additional flag
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
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
Update formulas.rst code blocks
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/
Don't hard code `/dev/null`
Use a 2nd call to revert to the old command.

This is more generic and should work on any platform.