Merge "add apache2 headers for shell scripts and ansible scripts" into stable/brahmaputra

author Justin chi <chigang@huawei.com>

Sat, 30 Jan 2016 06:12:56 +0000 (06:12 +0000)

committer Gerrit Code Review <gerrit@172.30.200.206>

Sat, 30 Jan 2016 06:12:56 +0000 (06:12 +0000)
author Justin chi <chigang@huawei.com>
Sat, 30 Jan 2016 06:12:56 +0000 (06:12 +0000)
committer Gerrit Code Review <gerrit@172.30.200.206>
Sat, 30 Jan 2016 06:12:56 +0000 (06:12 +0000)
diff --cc deploy/adapters/ansible/roles/ceph-config/tasks/create_config.yml
Simple merge
diff --cc deploy/adapters/ansible/roles/ceph-openstack/tasks/ceph_openstack_pre.yml
Simple merge
author	Justin chi <chigang@huawei.com>
	Sat, 30 Jan 2016 06:12:56 +0000 (06:12 +0000)
committer	Gerrit Code Review <gerrit@172.30.200.206>
	Sat, 30 Jan 2016 06:12:56 +0000 (06:12 +0000)
		1	2
deploy/adapters/ansible/roles/ceph-config/tasks/create_config.yml	patch \|	diff1 \|	diff2 \|	blob \| history
deploy/adapters/ansible/roles/ceph-openstack/tasks/ceph_openstack_pre.yml	patch \|	diff1 \|	diff2 \|	blob \| history