rabi 59b2a559ec Move merge_environment to environment_util module ... This moves the merge_environment utility function from service.py to environment_util.py. Change-Id: Ia005cf47d5e655e60359f8da397a712e749ce13c Blueprint: environment-merging		2016-08-22 13:46:34 +05:30
..
api	Remove tenant_safe flag from rpc and db api	2016-08-16 12:38:33 +05:30
cloudinit	Use Fedora 24 base image	2016-07-12 11:48:47 +02:00
cmd	Purge deleted stacks for specific project	2016-07-20 17:02:12 +00:00
common	Move merge_environment to environment_util module	2016-08-22 13:46:34 +05:30
db	Remove tenant_safe flag from rpc and db api	2016-08-16 12:38:33 +05:30
engine	Move merge_environment to environment_util module	2016-08-22 13:46:34 +05:30
hacking	Restrict use of iteritems, iterkeys and itervalues	2016-03-23 10:05:54 +00:00
httpd	Moved CORS middleware configuration into oslo-config-generator	2016-03-14 08:19:29 -07:00
locale	Imported Translations from Zanata	2016-06-02 07:02:51 +00:00
objects	Remove tenant_safe flag from rpc and db api	2016-08-16 12:38:33 +05:30
openstack	replace git protocol by https	2015-10-22 10:06:05 +08:00
rpc	Remove tenant_safe flag from rpc and db api	2016-08-16 12:38:33 +05:30
scaling	Clean imports in code	2016-08-16 12:44:36 +07:00
tests	Move merge_environment to environment_util module	2016-08-22 13:46:34 +05:30
__init__.py	Make import of oslo libraries namespaceless	2015-02-18 22:54:10 +01:00
version.py	Make the first line of every file consistent.	2014-03-04 09:03:04 -06:00