Update control.sh to match the no-rename deploy style.
Merge pull request #77 from VictorLowther/pull-req-release-betty-master-fd994cdc70

Stop renaming nodes as part of initial node discovery. [2/3]
Merge pull request #79 from ninja-cat/quickfix

Quick fix for /etc/init.d/nfs-kernel-server file permissions
Watch for the reset state in the provisioner, and whack boot_device if we hit it.

This should fix a case where a node is reset to change the RAID config, but
we do not forget what device we shoudl boot from like we should.
Merge pull request #91 from VictorLowther/pull-req-release-fred-master-f1e4ea797ca7b956a0c90301bd38ef8eed4e242e

Merged by devtool for aabes
Don't require IP address information for a node in order to be able to delete/cleanup/update.
This is done by stashing the hexified admin_ip address the first time around, and refering to it from there ever since
This helps resolve a kinda race condition when nodes are deleted, and thier IP addresses are deallocated.
make sure to clean up the saved boot_ip_hex value on reset, in case it changes when the node comes up again
fix typo - node <> mnode
Merge pull request #92 from aabes/pull-req-release-fred-master-ac9ce41ea52bc3bdbcec54ca4a3a5418f758d52c

Merged by devtool for aabes
don't delete dhcp/pxe/uefi info for reset node. treat reset same as discovering
Merge pull request #93 from aabes/release/fred/master

attempt to fix reset issues on multi nic nodes
provisioner using info provided by deployer (after node discovered) rather than compute it's own boot_ip_hex value in chef (can't write it out to the node after the fact... cross node posting is badness)
provisioner using info provided by deployer (after node discovered) rather than compute it's own boot_ip_hex value in chef (can't write it out to the node after the fact... cross node posting is badness)
admin_data_net info is required for dhcp
Merge branch 'v2.1.1-hadoop-dell' into release/fred/master
Merge branch 'aabes/v2.1.1-hadoop-dell' into HEAD
Merge pull request #97 from aabes/pull-req-release-fred-master-9c00ea1eb8047c2defe53ea521ed4c8b1c2fb263

Merged by devtool for VictorLowther
Merge branch 'release/betty/master' into release/fred/master

Conflicts:
	updates/control.sh
Merge branch 'release/hadoop-2.1/master' into release/fred/master