Merge "Fix some bugs on the enforce function."

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

Wed, 8 Jul 2015 09:17:35 +0000 (09:17 +0000)

committer Gerrit Code Review <gerrit@172.30.200.206>

Wed, 8 Jul 2015 09:17:35 +0000 (09:17 +0000)
author Ruan HE <ruan.he@orange.com>
Wed, 8 Jul 2015 09:17:35 +0000 (09:17 +0000)
committer Gerrit Code Review <gerrit@172.30.200.206>
Wed, 8 Jul 2015 09:17:35 +0000 (09:17 +0000)
diff --cc keystone-moon/keystone/contrib/moon/core.py
Simple merge
author	Ruan HE <ruan.he@orange.com>
	Wed, 8 Jul 2015 09:17:35 +0000 (09:17 +0000)
committer	Gerrit Code Review <gerrit@172.30.200.206>
	Wed, 8 Jul 2015 09:17:35 +0000 (09:17 +0000)