Merge "Add NodeAdminUserData interface for "heat-admin" user"

author Jenkins <jenkins@review.openstack.org>

Tue, 8 Sep 2015 13:03:38 +0000 (13:03 +0000)

committer Gerrit Code Review <review@openstack.org>

Tue, 8 Sep 2015 13:03:38 +0000 (13:03 +0000)
author Jenkins <jenkins@review.openstack.org>
Tue, 8 Sep 2015 13:03:38 +0000 (13:03 +0000)
committer Gerrit Code Review <review@openstack.org>
Tue, 8 Sep 2015 13:03:38 +0000 (13:03 +0000)
diff --cc overcloud-resource-registry-puppet.yaml
Simple merge
diff --cc puppet/ceph-storage-puppet.yaml
Simple merge
diff --cc puppet/cinder-storage-puppet.yaml
Simple merge
diff --cc puppet/compute-puppet.yaml
Simple merge
diff --cc puppet/controller-puppet.yaml
Simple merge
diff --cc puppet/swift-storage-puppet.yaml
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Tue, 8 Sep 2015 13:03:38 +0000 (13:03 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Tue, 8 Sep 2015 13:03:38 +0000 (13:03 +0000)
		1	2
overcloud-resource-registry-puppet.yaml	patch \|	diff1 \|	diff2 \|	blob \| history
puppet/ceph-storage-puppet.yaml	patch \|	diff1 \|	diff2 \|	blob \| history
puppet/cinder-storage-puppet.yaml	patch \|	diff1 \|	diff2 \|	blob \| history
puppet/compute-puppet.yaml	patch \|	diff1 \|	diff2 \|	blob \| history
puppet/controller-puppet.yaml	patch \|	diff1 \|	diff2 \|	blob \| history
puppet/swift-storage-puppet.yaml	patch \|	diff1 \|	diff2 \|	blob \| history