2012.1 "Essex" 

more files missing in sdist tarball bug 943782 Change-Id: I08df8de1280071e5a528af927d5fc1d30868b140

Merge "Make tox config work." 

blueprint refactor-readme-to-manual Removes most of the content from the README to avoid it becoming outdated and stale given that our currently maintained docs are now on http://docs.openstack.org . In some cases, including keystone config, extension writing, etc. this means text from the README is being transferred directly from the README to an external doc so we make sure we don't lose anything. Change-Id: Ie08db4bd4854bb45e6777b1e0abe37f51d3e5c5c

Merge from launchpad quantum/diablo branch: merge salv's fix to remove keystone middleware: lp855151 one more 202->200 from tyler merge tylers additional 202 -> 200 changes merge additions to OVS readme describing running with multiple hosts merge brad's changes to make create API calls return 200, not 202 merge unit test for showing unset attachment merging API docs branch Merge: lp:~yinliu2/quantum/bug856564 Merge: lp:~bgh/quantum/bug850261 Change-Id: I56fe24c59f918737e57b562343c33ec6dcceac60

Fixing Cisco plugin after update_* change Also a few fixes from packaging changes Change-Id: I7ad7d5bc741fed9d09120148ad75f41df6722b59