Updated openstack/openstack
Project: openstack/nova  7e9f0de5c1b4703f3477062609c5bf43b5cf91dc
null
Update nova.conf.sample

Recent version of python-keystoneclient introduces new option,
include_service_catalog, so nova.conf.sample should be updated.

Closes-bug: #1268614
Change-Id: I8f5f76770b8af8002f6a296594303224ec37846c
Updated openstack/openstack
Project: openstack/swift  7988a5e0063d2ca5cf5b3610ef7ed3e6f66c03b2
null
Warn if read_affinity is configured but not enabled

To get the proxy's read affinity to work, you have to set both
"read_affinity = <stuff>" and "sorting_method = affinity" in the proxy
config. If you set the first but not the second, then you don't get
read affinity, and Swift doesn't help you determine why not.

Now the proxy will emit a warning message if read_affinity is set but
sorting_method is a value other than "affinity", so if you check your
logs to see why it isn't working, you'll get a hint.

Note that the message comes out twice per proxy process, so with 2
workers you'll see the warning 6 times on startup (2 for master + 2 *
2 per worker). It's sort of annoying, but at least it's not
per-request.

Bonus docstring fix: remove a sentence that's not true

Change-Id: Iad37d4979a1b7c45c0e3d1b83336dbcf7a68a0c9