tree dc79d8daf30bba3a7c5913c3ea5b0f864d0a5bfa
parent 0d560a9ce40cdf19e43fcbc480ec1d8745d5c6af
parent d750c2d284ddcadc37ccea0cfa625ae987b7e982
author Jenkins <jenkins@review.openstack.org> 1457510883 +0000
committer Gerrit Code Review <review@openstack.org> 1457510883 +0000

Merge "Switch hdp to cdh in the default list of Sahara plugins"