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
Change getBareMetalInstances call to getHardware

Per a ticket with softlayer because their API was returning an empty array to calls to getBareMetalInstances:

You do not have any machines flagged as a Bare Metal Instance. We used to refer to physical machines as Bare Metal Dedicated (monthly) and Bare Metal Instance (hourly). Now we refer to them as Bare Metal (monthly) and Bare Metal hourly (hourly). The getBareMetalInstances function will still return the hourly.

getHardware gets both according to Softlayer.
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
Adding optional tag functionality to salt.modules.dockerio.push
Adding optional tag in salt.states.dockerio.pushed
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
Update formulas.rst code blocks