Adding upstream version 18.2.2.upstream/18.2.2

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 142 insertions, 0 deletions

diff --git a/doc/changelog/v0.67.1.txt b/doc/changelog/v0.67.1.txt
new file mode 100644
index 000000000..9b9405f82
--- /dev/null
+++ b/doc/changelog/v0.67.1.txt
@@ -0,0 +1,142 @@
+commit e23b817ad0cf1ea19c0a7b7c9999b30bed37d533
+Author: Gary Lowell <gary.lowell@inktank.com>
+Date:   Fri Aug 16 19:39:41 2013 -0700
+
+    v0.67.1
+
+commit 1aa01910957e967e87e46b86f1e67844148703e3
+Author: Dan Mick <dan.mick@inktank.com>
+Date:   Thu Aug 15 17:10:56 2013 -0700
+
+    ceph.in: --admin-daemon was not returning EINVAL on bad command
+    
+    Fix by restructuring code to hoist common code and have only one
+    place where admin_socket is actually called.
+    
+    Signed-off-by: Dan Mick <dan.mick@inktank.com>
+    (cherry picked from commit 266460e97ec9ef9711e9eaa4bd954f3188d8da69)
+
+commit d290a91525c3ebc6941dae2bb55f0bfbf120cb60
+Author: Sage Weil <sage@inktank.com>
+Date:   Thu Aug 15 14:37:07 2013 -0700
+
+    mon: use str_join instead of std::copy
+    
+    The std::copy method leaves a trailing separator.
+    
+    Signed-off-by: Sage Weil <sage@inktank.com>
+    Reviewed-by: Dan Mick <dan.mick@inktank.com>
+    (cherry picked from commit 35565ee64e41d7fddc7849c6006692c78227132c)
+
+commit b99921746ef2e1e15777c748a15e929c72888db1
+Author: Sage Weil <sage@inktank.com>
+Date:   Thu Aug 15 14:36:57 2013 -0700
+
+    config: fix stringification of config values
+    
+    The std::copy construct leaves a trailing separator character, which breaks
+    parsing for booleans (among other things) and probably mangles everything
+    else too.
+    
+    Backport: dumpling
+    Signed-off-by: Sage Weil <sage@inktank.com>
+    Reviewed-by: Samuel Just <sam.just@inktank.com>
+    (cherry picked from commit fc23cfe3fe567b30413d8af0c614a32fec238939)
+
+commit d212bba6bd0d7d234097122988e4d973064b5645
+Author: Sage Weil <sage@inktank.com>
+Date:   Thu Aug 15 14:36:49 2013 -0700
+
+    common: add str_join helper
+    
+    Signed-off-by: Sage Weil <sage@inktank.com>
+    Reviewed-by: Dan Mick <dan.mick@inktank.com>
+    (cherry picked from commit ce3a0944d9b47f7b178fe7775c9d105305b238e0)
+
+commit a99fef9189086f5dd6ddacaecf967619dc5fe407
+Author: Josh Durgin <josh.durgin@inktank.com>
+Date:   Wed Aug 14 15:50:59 2013 -0700
+
+    rados.py: fix Rados() unicode checking
+    
+    Check new parameters and check that rados_id is not None again to
+    catch the empty string.
+    
+    Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
+    Reviewed-by: Sage Weil <sage.weil@inktank.com>
+    (cherry picked from commit 4422f21a6586467a63ce6841552d0f60aa849cf1)
+
+commit dd0df583e2661444287a36acc240a8ac0ec381e8
+Author: Josh Durgin <josh.durgin@inktank.com>
+Date:   Wed Aug 14 15:28:19 2013 -0700
+
+    rados.py: fix Rados() backwards compatibility
+    
+    Previously it had no name parameter, so the default will be used by
+    old clients. However, if an old client set rados_id, a new check that
+    both rados_id and name are set would result in an error. Fix this by
+    only applying the default names after the check, and add tests of this
+    behavior.
+    
+    This was introduced in 783b7ec847c7f987ac1814c9c41c91921cac4eba,
+    so it does not affect cuttlefish.
+    
+    Fixes: #5970
+    Reported-by: Michael Morgan <mmorgan@dca.net>
+    Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
+    Reviewed-by: Sage Weil <sage.weil@inktank.com>
+    (cherry picked from commit 34da9cbc33205623cf64aee1989f53dfb2c5bddd)
+
+commit b9d1bf51610159a88ad257f29a81691e6b178e17
+Author: Sage Weil <sage@inktank.com>
+Date:   Tue Aug 13 12:52:41 2013 -0700
+
+    librados: fix async aio completion wakeup
+    
+    For aio flush, we register a wait on the most recent write.  The write
+    completion code, however, was *only* waking the waiter if they were waiting
+    on that write, without regard to previous writes (completed or not).
+    For example, we might have 6 and 7 outstanding and wait on 7.  If they
+    finish in order all is well, but if 7 finishes first we do the flush
+    completion early.  Similarly, if we
+    
+     - start 6
+     - start 7
+     - finish 7
+     - flush; wait on 7
+     - finish 6
+    
+    we can hang forever.
+    
+    Fix by doing any completions that are prior to the oldest pending write in
+    the aio write completion handler.
+    
+    Refs: #5919
+    
+    Signed-off-by: Sage Weil <sage@inktank.com>
+    Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
+    Tested-by: Oliver Francke <Oliver.Francke@filoo.de>
+    (cherry picked from commit 16ed0b9af8bc08c7dabead1c1a7c1a22b1fb02fb)
+
+commit 29ae033b435581a64fc92a26106b4ea1c3dfc0b1
+Author: Josh Durgin <josh.durgin@inktank.com>
+Date:   Mon Aug 12 19:17:09 2013 -0700
+
+    librados: fix locking for AioCompletionImpl refcounting
+    
+    Add an already-locked helper so that C_Aio{Safe,Complete} can
+    increment the reference count when their caller holds the
+    lock. C_AioCompleteAndSafe's caller is not holding the lock, so call
+    regular get() to ensure no racing updates can occur.
+    
+    This eliminates all direct manipulations of AioCompletionImpl->ref,
+    and makes the necessary locking clear.
+    
+    The only place C_AioCompleteAndSafe is used is in handling
+    aio_flush_async(). This could cause a missing completion.
+    
+    Refs: #5919
+    Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
+    Reviewed-by: Sage Weil <sage@inktank.com>
+    Tested-by: Oliver Francke <Oliver.Francke@filoo.de>
+    (cherry picked from commit 7a52e2ff5025754f3040eff3fc52d4893cafc389)