Merge remote-tracking branch 'gh/master' into wip-watch-notify

Conflicts:
	PendingReleaseNotes

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Josh During <jdurgin@redhat.com>

diff --cc PendingReleaseNotes
index 1a916c10f92e5b6314e8d4857ec56590aeb4b404,62b79204964a1f9a90400470d3033fa2e9334bd8..ce8cb7b3ef7ae61473780714cd94ea0a344dd56c
--- 1/PendingReleaseNotes
--- 2/PendingReleaseNotes
+++ b/PendingReleaseNotes
@@@ -29,12 -29,7 +29,18 @@@ v0.9
  * The 'rados create <objectname> [category]' optional category argument is no
    longer supported or recognized.
  
+ * rados.py's Rados class no longer has a __del__ method; it was causing
+   problems on interpreter shutdown and use of threads.  If your code has
+   Rados objects with limited lifetimes and you're concerned about locked
+   resources, call Rados.shutdown() explicitly.
++
 +* There is a new version of the librados watch/notify API with vastly
 +  improved semantics.  Any applications using this interface are
 +  encouraged to migrate to the new API.  The old API calls are marked
 +  as deprecated and will eventually be removed.
 +
 +* The librados rados_unwatch() call used to be safe to call on an
 +  invalid handle.  The new version has undefined behavior when passed
 +  a bogus value (for example, when rados_watch() returns an error and
 +  handle is not defined).
++

diff --cc src/client/Client.cc
Simple merge

diff --cc src/common/config_opts.h
Simple merge

diff --cc src/include/ceph_fs.h
Simple merge

diff --cc src/include/encoding.h
Simple merge

diff --cc src/include/rados.h
Simple merge

diff --cc src/include/rados/librados.h
Simple merge

diff --cc src/include/rados/librados.hpp
Simple merge

diff --cc src/librados/librados.cc
Simple merge

diff --cc src/mds/MDS.cc
Simple merge

diff --cc src/osd/OSD.cc
Simple merge

diff --cc src/osd/ReplicatedPG.cc
Simple merge

diff --cc src/osd/ReplicatedPG.h
Simple merge

diff --cc src/osd/osd_types.cc
Simple merge

diff --cc src/rgw/rgw_cache.h
Simple merge

diff --cc src/rgw/rgw_rados.cc
Simple merge

diff --cc src/rgw/rgw_rados.h
Simple merge

diff --cc src/tracing/librados.tp
Simple merge

diff --cc src/tracing/osd.tp
Simple merge