Dolph Mathews 86aaff4a50 Merge remote-tracking branch 'origin/feature/keystone-v3' into HEAD ... Conflicts: keystone/catalog/core.py keystone/identity/core.py Change-Id: Id47b9dd9c4da811d13454b539f78b751d40ed87d		2012-11-02 14:53:44 -05:00
..
default_catalog.templates	Fix default port for identity.internalURL	2012-03-15 11:38:29 +01:00
keystone.conf.sample	Merge remote-tracking branch 'origin/feature/keystone-v3' into HEAD	2012-11-02 14:53:44 -05:00
logging.conf.sample	Improved file logging example (bug 959610)	2012-03-19 16:33:00 -05:00
policy.json	port common policy code to keystone	2012-03-08 14:06:32 -08:00