Merge branch 'release/fred/master' into release/fred/hadoop-os-build
Merge remote-tracking branch 'origin/release/fred/hadoop-os-build' into release/fred/hadoop-os-build
Merge remote-tracking branch 'origin/release/fred/hadoop-os-build' into release/fred/hadoop-os-build
Merge pull request #1242 from VictorLowther/pull-req-release-fred-master-aba63c54bb

Fail to PXE boot if we want to boot locally [2/5]
Merge remote-tracking branch 'origin/release/fred/hadoop-os-build' into release/fred/hadoop-os-build
adding submodule for barclamp-tempest
using http insted of https while pull from barclamp-tempest
Merge pull request #1296 from MirantisDellCrowbar/release/fred/master

adding barclamp-tempest as a submodule to the release/fred/master
Revert "using http insted of https while pull from barclamp-tempest"

This reverts commit 6d108832e99bb2f9a484225974d99304f1482b5c.
Revert "adding submodule for barclamp-tempest"

This reverts commit 96d0f652b3cd7ccd77d3d1d1e998505317ee3d6b.
Merge branch 'release/fred/master' into release/fred/hadoop-os-build
Merge pull request #1311 from galthaus/pull-req-release-fred-hadoop-os-build-8a0dfdcda5

Add tempest to the correct spot [3/3]
Merge remote-tracking branch 'origin/release/fred/hadoop-os-build' into release/fred/hadoop-os-build
Add updated submodule references for release/fred/master
Merge branch 'release/fred/master' into release/fred/hadoop-os-build
Merge pull request #1486 from cloudedge/pull-req-release-fred-master-b3888bc5cc

Fix Node Selection Naming Bug (that was driving me crazy) [2/5]
Merge pull request #1489 from cloudedge/pull-req-release-fred-hadoop-os-build-f317951f82

Fix Node Selection Naming Bug (that was driving me crazy) [5/5]
Merge branch 'release/fred/master' into release/fred/hadoop-os-build
Add updated submodule references for release/fred/master
Merge branch 'release/fred/master' into release/fred/hadoop-os-build