Merge "Update password to conform to password set in test platform"

author Ruan HE <ruan.he@orange.com>

Mon, 29 Aug 2016 11:10:34 +0000 (11:10 +0000)

committer Gerrit Code Review <gerrit@172.30.200.206>

Mon, 29 Aug 2016 11:10:34 +0000 (11:10 +0000)
author Ruan HE <ruan.he@orange.com>
Mon, 29 Aug 2016 11:10:34 +0000 (11:10 +0000)
committer Gerrit Code Review <gerrit@172.30.200.206>
Mon, 29 Aug 2016 11:10:34 +0000 (11:10 +0000)
diff --cc moonclient/moonclient/tests/tests_empty_policy_new_user.json
Simple merge
diff --cc tests/run_tests.py
Simple merge
author	Ruan HE <ruan.he@orange.com>
	Mon, 29 Aug 2016 11:10:34 +0000 (11:10 +0000)
committer	Gerrit Code Review <gerrit@172.30.200.206>
	Mon, 29 Aug 2016 11:10:34 +0000 (11:10 +0000)
		1	2
moonclient/moonclient/tests/tests_empty_policy_new_user.json	patch \|	diff1 \|	diff2 \|	blob \| history
tests/run_tests.py	patch \|	diff1 \|	diff2 \|	blob \| history