]>
git.apps.os.sepia.ceph.com Git - ceph.git/log
Piotr Dałek [Sat, 23 Apr 2016 12:06:42 +0000 (14:06 +0200)]
lockdep: Convert free_ids from list to bitmap
Convert "free_ids" list to bitmap, reducing its memory usage from
16 + MAX_LOCKS * 20 (~20KB) to MAX_LOCKS/8 (512b) and save some time
(re)populating the free id array.
Signed-off-by: Piotr Dałek <git@predictor.org.pl>
Piotr Dałek [Fri, 22 Apr 2016 18:34:05 +0000 (20:34 +0200)]
lockdep: Reduce "follows" matrix size by 8
Convert "follows" matrix to 2-dimensional array of bits, reducing its
storage size from 16 MB (assuming MAX_LOCKS = 4096) to 2MB.
Signed-off-by: Piotr Dałek <git@predictor.org.pl>
Piotr Dałek [Fri, 22 Apr 2016 18:03:17 +0000 (20:03 +0200)]
lockdep: Reduce matrices usage range to minimum
Introduce current_maxid variable which holds highest lock ID. Using that,
don't attempt to check/reset parts of "follows" and "follows_bt" matrices
that are not used yet. This improves performance by reducing CPU usage
(particularly by lockdep_unregister() function), this also reduces RSS
memory usage by quite a bit, as many allocated pages are not actually
touched anymore. Improve CPU usage a bit more, by using memset() to
reset "follows" members instead of iterating byte-by-byte.
Finally, use push_front instead of push_back when unregistering, so
unregistered IDs will be recycled.
Signed-off-by: Piotr Dałek <git@predictor.org.pl>
Samuel Just [Fri, 20 May 2016 22:32:09 +0000 (15:32 -0700)]
Merge pull request #9241 from ceph/wip-fix-q-tests
common/: fix tests for prioritized_queue and wpq
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Yehuda Sadeh [Fri, 20 May 2016 22:30:44 +0000 (15:30 -0700)]
Merge pull request #9102 from yehudasa/wip-rgw-leak-4
rgw: don't unregister request if request is not connected to manager
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Samuel Just [Fri, 20 May 2016 22:22:56 +0000 (15:22 -0700)]
common/: fix tests for prioritized_queue and wpq
Introduced:
27b6ec40b93c05fbaa228783e11e2fac8f1a1ee1
Signed-off-by: Samuel Just <sjust@redhat.com>
Sage Weil [Fri, 20 May 2016 18:06:05 +0000 (14:06 -0400)]
Merge pull request #9216 from dzafman/wip-test-fix
test: Disable tests due to recovery race
David Zafman [Fri, 20 May 2016 05:22:09 +0000 (22:22 -0700)]
test: Disable tests due to recovery race
Disable:
osd-scrub-repair.sh
test-erasure-eio.sh
test-erasure-code.sh
These test are failing due to race conditions that is exposing
bug http://tracker.ceph.com/issues/13937.
Signed-off-by: David Zafman <dzafman@redhat.com>
Mykola Golub [Fri, 20 May 2016 17:52:42 +0000 (20:52 +0300)]
Merge pull request #9211 from dillaman/wip-15938
librbd: write-after-write might result in an inconsistent replicated image
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
Sage Weil [Fri, 20 May 2016 17:26:02 +0000 (13:26 -0400)]
Merge pull request #9231 from athanatos/wip-recovery-wq
osd: Put background recovery tasks in the main OpWQ
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Fri, 20 May 2016 17:00:09 +0000 (13:00 -0400)]
Merge pull request #6208 from liewegas/wip-alloc-hints
librados,osd: rados hints for future access pattern
Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Sage Weil [Fri, 20 May 2016 16:59:35 +0000 (12:59 -0400)]
Merge pull request #7070 from majianpeng/headerbeatmap-check
common/HeartbeatMap: print stack info of unhealth thread.
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Fri, 20 May 2016 16:59:16 +0000 (12:59 -0400)]
Merge pull request #7843 from branch-predictor/bp-smart-async-wp
msg/async: Implement smarter worker thread selection
Reviewed-by: Haomai Wang <haomai@xsky.com>
Sage Weil [Fri, 20 May 2016 16:58:36 +0000 (12:58 -0400)]
Merge pull request #8141 from songbaisen/song14
crush: fix the problem can not find the define item below the bucket
Reviewed-by: Kefu Chai <kchai@redhat.com>
Sage Weil [Fri, 20 May 2016 16:57:53 +0000 (12:57 -0400)]
Merge pull request #8840 from tchaikov/wip-opt-u32
common/config: cast OPT_U32 options using uint32_t
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Fri, 20 May 2016 16:56:55 +0000 (12:56 -0400)]
Merge pull request #9072 from liewegas/wip-15840
osd: fix crush location update on startup
Sage Weil [Fri, 20 May 2016 16:56:21 +0000 (12:56 -0400)]
Merge pull request #9116 from ddiss/librados_sparse_read_use_snapid
librados: use caller provided snapid for aio_sparse_read()
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Orit Wasserman [Fri, 20 May 2016 16:02:26 +0000 (18:02 +0200)]
Merge pull request #9002 from rzarzynski/wip-rgw-swift-acct_cont_md-fix
rgw: fix updating account/container metadata of Swift API.
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
Kefu Chai [Fri, 20 May 2016 13:46:29 +0000 (21:46 +0800)]
Merge pull request #9225 from dachary/wip-run-make-check
tests: rm -fr /tmp/*virtualenv*
Reviewed-by: Erwan Velu <erwan@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Casey Bodley [Fri, 20 May 2016 13:11:28 +0000 (09:11 -0400)]
Merge pull request #9165 from mikulely/fix-rgw-multisite-test
rgw: misc fix for test_multi.py
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Loic Dachary [Fri, 20 May 2016 11:19:07 +0000 (13:19 +0200)]
tests: rm -fr /tmp/*virtualenv*
Signed-off-by: Loic Dachary <loic@dachary.org>
Sage Weil [Fri, 20 May 2016 13:00:07 +0000 (09:00 -0400)]
Merge pull request #9139 from majianpeng/bluestore-statfs
os/bluestore/BlueStore: free space of bluestore should reduce spaces …
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Fri, 20 May 2016 12:32:33 +0000 (08:32 -0400)]
Merge pull request #9161 from cxwshawn/wip-tc1-fix
osd: optimize header file dependency to decreace compile time when modify any file
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Fri, 20 May 2016 12:32:25 +0000 (08:32 -0400)]
Merge pull request #9193 from cxwshawn/wip-tc2-fix
mon: optimize header file dependency.
Reviewed-by: Sage Weil <sage@redhat.com>
Jason Dillaman [Fri, 20 May 2016 12:24:15 +0000 (08:24 -0400)]
Merge pull request #9068 from trociny/wip-pybind-rbd-mirror
librbd: initial python APIs to support mirroring
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Jason Dillaman [Fri, 20 May 2016 12:23:37 +0000 (08:23 -0400)]
Merge pull request #9088 from trociny/wip-15500
qa: dynamic_features.sh: return error only if it failed on alive QEMU
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Jason Dillaman [Fri, 20 May 2016 12:22:56 +0000 (08:22 -0400)]
Merge pull request #9140 from zhouyuan/fix_disable_journaling
librbd: close journal before removing
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Jason Dillaman [Fri, 20 May 2016 12:21:14 +0000 (08:21 -0400)]
Merge pull request #9177 from trociny/wip-15916
rbd-mirror: it might got stuck in calculating "behind master" position
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Jason Dillaman [Thu, 19 May 2016 19:52:16 +0000 (15:52 -0400)]
journal: replay position might change after pruning stale tags
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Jason Dillaman [Thu, 19 May 2016 19:50:04 +0000 (15:50 -0400)]
librbd: delay commit of overwritten journal event
With the cache enabled and write-after-write IOs to the same
object extents, it was possible for the overwritten journal event
to be committed before the overwriter journal event was written
to disk. If a client crash occurs before the event is written,
the image will be inconsistent on replay.
Fixes: http://tracker.ceph.com/issues/15938
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
John Spray [Fri, 20 May 2016 11:10:16 +0000 (12:10 +0100)]
Merge pull request #9196 from tchaikov/wip-cmake-vstart
cmake: add cython_rados to vstart target
Reviewed-by: John Spray <john.spray@redhat.com>
Orit Wasserman [Fri, 20 May 2016 11:04:14 +0000 (13:04 +0200)]
Merge pull request #8164 from rzarzynski/wip-rgw-bulkdel-slashfix
rgw: handle initial slashes properly in BulkDelete of Swift API.
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
Radoslaw Zarzynski [Tue, 15 Mar 2016 15:48:26 +0000 (16:48 +0100)]
rgw: handle initial slashes properly in BulkDelete of Swift API.
Fixes: http://tracker.ceph.com/issues/15948
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
Sage Weil [Fri, 20 May 2016 10:35:38 +0000 (06:35 -0400)]
Merge pull request #9220 from cxwshawn/wip-tc3-fix
auth: optimize header file dependency.
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Fri, 20 May 2016 10:35:11 +0000 (06:35 -0400)]
Merge pull request #9212 from liewegas/wip-bit-alloc-test
tests: disable unittest_bit_alloc for now
Reviewed-by: Nathan Cutler <ncutler@suse.com>
Sage Weil [Fri, 20 May 2016 10:28:16 +0000 (06:28 -0400)]
Merge pull request #9219 from renhwztetecs/renhw-wip-logmonitor-cleanup
mon/log: clean unused function and comments
Reviewed-by: Sage Weil <sage@redhat.com>
shawn [Fri, 20 May 2016 09:32:15 +0000 (05:32 -0400)]
test: file change affected by auth file header optimization.
Signed-off-by: Xiaowei Chen <chen.xiaowei@h3c.com>
shawn [Fri, 20 May 2016 08:39:29 +0000 (04:39 -0400)]
AUTH: optimize header file dependency.
same work as PR: https://github.com/ceph/ceph/pull/9193, https://github.com/ceph/ceph/pull/9161
Signed-off-by: Xiaowei Chen <chen.xiaowei@h3c.com>
huanwen ren [Fri, 20 May 2016 08:41:39 +0000 (16:41 +0800)]
mon/log: using standard macros instead of -1
using standard macros instead of -1
Signed-off-by: huanwen ren <ren.huanwen@zte.com.cn>
huanwen ren [Fri, 20 May 2016 08:38:06 +0000 (16:38 +0800)]
mon/log: clean unused function and comments
clean unused function and comments
Signed-off-by: huanwen ren <ren.huanwen@zte.com.cn>
Orit Wasserman [Fri, 20 May 2016 08:30:25 +0000 (10:30 +0200)]
Merge pull request #8656 from kmroz/wip-rgw-handler-cleanup-1
rgw-rest: remove redundant virtual functions
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
Orit Wasserman [Fri, 20 May 2016 08:28:08 +0000 (10:28 +0200)]
Merge pull request #8886 from cbodley/wip-rgw-zone-short-ids
rgw: check for short_zone_id collisions on period update
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
Orit Wasserman [Fri, 20 May 2016 08:23:22 +0000 (10:23 +0200)]
Merge pull request #9148 from rzarzynski/wip-rgw-15902
rgw: camelcase names of custom attributes in Swift's responses.
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
Orit Wasserman [Fri, 20 May 2016 08:21:51 +0000 (10:21 +0200)]
Merge pull request #9042 from rzarzynski/wip-rgw-15812
rgw: handle errors properly during GET on Swift's DLO.
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
Orit Wasserman [Fri, 20 May 2016 08:19:23 +0000 (10:19 +0200)]
Merge pull request #9149 from cbodley/wip-rgw-zone-modify-master
rgw: add_zone only clears master_zone if --master=false
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
Orit Wasserman [Fri, 20 May 2016 08:18:22 +0000 (10:18 +0200)]
Merge pull request #9154 from yehudasa/wip-15886
rgw: keep track of written_objs correctly
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
Mykola Golub [Fri, 20 May 2016 07:16:21 +0000 (10:16 +0300)]
Merge pull request #9190 from dillaman/wip-15928
librbd: metadata retrieval added to open image state machine
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
Mykola Golub [Fri, 20 May 2016 05:58:07 +0000 (08:58 +0300)]
Merge pull request #9191 from dillaman/wip-15930
rbd-mirror: disable librbd caching for replicated images
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
Mykola Golub [Fri, 20 May 2016 05:57:02 +0000 (08:57 +0300)]
Merge pull request #9173 from dillaman/wip-15909
rbd-mirror: potential crash during image status update
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
Kefu Chai [Fri, 20 May 2016 04:36:44 +0000 (12:36 +0800)]
Merge pull request #8983 from dzafman/wip-li-rados
tools/rados: Improve list-inconsistent json format
Reviewed-by: Kefu Chai <kchai@redhat.com>
Jiaying Ren [Tue, 17 May 2016 15:23:00 +0000 (23:23 +0800)]
rgw: misc fix for test_multi.p
remove redundent meta_checkpoint, cause realm.create_user(user) will
call meta_checkpoint by default(via wait_meta = True).
Signed-off-by: Jiaying Ren <jiaying.ren@umcloud.com>
cxwshawn [Wed, 18 May 2016 03:53:52 +0000 (11:53 +0800)]
OSD: optimize header file dependency to decreace compile time when modify any file
OSD's left header dependency optimize.
Signed-off-by: Xiaowei Chen <chen.xiaowei@h3c.com>
shawn [Tue, 17 May 2016 08:18:14 +0000 (04:18 -0400)]
PG: optimize header file dependency to decreace compile time when modify any file
PG Layer's header dependency optimize.
Signed-off-by: Xiaowei Chen <chen.xiaowei@h3c.com>
shawn [Tue, 17 May 2016 06:14:01 +0000 (02:14 -0400)]
PGBackend: optimize header file dependency to decreace compile time when modify any file
hmm, everytime modify any file, then compile, then wait&wait&wait, so trying to optimize
this part, wish to decrease header dependency, try to improve compile speed.
Signed-off-by: Xiaowei Chen <chen.xiaowei@h3c.com>
shawn [Fri, 20 May 2016 02:37:49 +0000 (22:37 -0400)]
tool: change affected file include relation by mon file header optimize
Signed-off-by: Xiaowei Chen <chen.xiaowei@h3c.com>
cxwshawn [Thu, 19 May 2016 05:03:29 +0000 (13:03 +0800)]
MON: optimize header file dependency.
same work as PR: https://github.com/ceph/ceph/pull/9161
Signed-off-by: Xiaowei Chen <chen.xiaowei@h3c.com>
songbaisen [Wed, 16 Mar 2016 02:55:47 +0000 (10:55 +0800)]
crush: fix the problem that can not find the define item below the bucket
Fixes: http://tracker.ceph.com/issues/15154
Signed-off-by: song baisen <song.baisen@zte.com.cn>
Samuel Just [Thu, 19 May 2016 23:08:32 +0000 (16:08 -0700)]
Merge pull request #9108 from tchaikov/wip-13990
osd: reset session->osdmap if waiting_for_pg is empty
Reviewed-by: Samuel Just <sjust@redhat.com>
Gregory Farnum [Thu, 19 May 2016 22:34:21 +0000 (15:34 -0700)]
Merge pull request #8908 from jcsp/wip-15705
mds: fix mdsmap print_summary with standby replays
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Sage Weil [Thu, 19 May 2016 21:11:48 +0000 (17:11 -0400)]
tests: disable unittest_bit_alloc for now
See http://tracker.ceph.com/issues/15941
Signed-off-by: Sage Weil <sage@redhat.com>
Jason Dillaman [Thu, 19 May 2016 18:13:46 +0000 (14:13 -0400)]
ObjectCacher: pass new journal tid when overwriting extent
librbd needs to ensure the new journal event has been safely
committed to disk before it can mark an overwritten journal
event as committed.
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Jason Dillaman [Thu, 19 May 2016 17:48:22 +0000 (13:48 -0400)]
qa/workunits/rbd: record rbd CLI debug messages during mirror stress
The debug messages from 'rbd bench-write' and 'rbd snap create',
in addition to the existing debug messages from rbd-mirror, make
it possible to determine the source of any image inconsistency.
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Sage Weil [Thu, 19 May 2016 20:01:10 +0000 (16:01 -0400)]
Merge pull request #9199 from jmunhoz/mc-brp-aws4
doc: rgw: minor cleanup and doc update
Casey Bodley [Thu, 19 May 2016 15:16:48 +0000 (11:16 -0400)]
Merge pull request #9133 from tchaikov/wip-cmake-selinux
cmake: add selinux support
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Jason Dillaman [Thu, 19 May 2016 14:11:12 +0000 (10:11 -0400)]
journal: reset watch step after pruning expired tag
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Jason Dillaman [Wed, 18 May 2016 15:01:22 +0000 (11:01 -0400)]
rbd-mirror: additional debug messages during image replayer start/stop
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Jason Dillaman [Wed, 18 May 2016 04:55:01 +0000 (00:55 -0400)]
rbd-mirror: ensure proper handling of status updates during shutdown
Previously, several shutdown race conditions could occur due to the
use of the async work queue for scheduling updates.
Fixes: http://tracker.ceph.com/issues/15909
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Jason Dillaman [Wed, 18 May 2016 03:31:02 +0000 (23:31 -0400)]
rbd-mirror: track bootstrap state within image status
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Jason Dillaman [Wed, 18 May 2016 03:25:25 +0000 (23:25 -0400)]
rbd-mirror: combine ImageReplayer stopped and uninitialized states
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Jason Dillaman [Tue, 17 May 2016 20:14:42 +0000 (16:14 -0400)]
rbd-mirror: lock ordering issue in status update callback
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Casey Bodley [Thu, 19 May 2016 13:33:45 +0000 (09:33 -0400)]
Merge pull request #9192 from tchaikov/cmake-object-library
cmake: use object library instead recompiling popular .cc files
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Jason Dillaman [Thu, 19 May 2016 00:53:26 +0000 (20:53 -0400)]
rbd-mirror: disable librbd caching for replicated images
Each image has its own cache and each cache uses its own thread. With
a large replicated cluster, this could result in thousands of extra
threads and gigabytes of extra memory.
Fixes: http://tracker.ceph.com/issues/15930
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Orit Wasserman [Thu, 19 May 2016 09:54:40 +0000 (11:54 +0200)]
Merge pull request #9146 from cbodley/wip-rgw-period-push
radosgw-admin: fix 'period push' handling of --url
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
Javier M. Mellid [Thu, 19 May 2016 08:48:25 +0000 (10:48 +0200)]
rgw: doc: bucket request payment update
S3 doc update.
The bucket request payment feature is available in Jewel
commits:
899d7754fe15ab8635fb506fcadafa8e5e92c376
461bd7fa08710be994c522c4d173a4151dbc173a
Signed-off-by: Javier M. Mellid <jmunhoz@igalia.com>
Mykola Golub [Wed, 11 May 2016 11:33:00 +0000 (14:33 +0300)]
test: initial python APIs to support mirroring
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
Mykola Golub [Wed, 11 May 2016 11:29:17 +0000 (14:29 +0300)]
rbd: initial python APIs to support mirroring
Fixes: http://tracker.ceph.com/issues/15656
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
Javier M. Mellid [Thu, 19 May 2016 08:13:35 +0000 (10:13 +0200)]
rgw: aws4: fix log message
With the UNSIGNED-PAYLOAD bugfix in place this log message requires an update.
Requests asking for unsigned payloads don't need any completion handler so
notifying about body detection in this point is not accurate.
Signed-off-by: Javier M. Mellid <jmunhoz@igalia.com>
Sage Weil [Thu, 19 May 2016 08:21:36 +0000 (04:21 -0400)]
Merge pull request #8553 from yatinkumbhare/doc-fix
doc: fix broken link for bootstrapping monitors
Kefu Chai [Thu, 19 May 2016 08:12:06 +0000 (16:12 +0800)]
cmake: add cython_rados to vstart target
"ceph" cli imports rados python module
Signed-off-by: Kefu Chai <kchai@redhat.com>
Loic Dachary [Thu, 19 May 2016 07:09:49 +0000 (09:09 +0200)]
Merge pull request #9182 from objoo/YD-mailmap-updates-MAY
Leftover of previous mailmap not merged.
Reviewed-by: Loic Dachary <ldachary@redhat.com>
Kefu Chai [Thu, 19 May 2016 05:08:22 +0000 (13:08 +0800)]
Merge pull request #9143 from tchaikov/wip-osdmaptool-man
man: osdmaptool: document test-map-pgs* options
Reviewed-by: Vikhyat Umrao <vumrao@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Kefu Chai [Thu, 19 May 2016 04:49:58 +0000 (12:49 +0800)]
cmake: make common/TextTable.cc an object library
so we don't recompile it whenever it is used.
Signed-off-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Thu, 19 May 2016 04:23:10 +0000 (12:23 +0800)]
cmake: reuse secret.c's object library
so we don't need to recompile it when using it.
Signed-off-by: Kefu Chai <kchai@redhat.com>
Tamilarasi Muthamizhan [Thu, 19 May 2016 01:03:32 +0000 (18:03 -0700)]
Merge pull request #9153 from ceph/openstack_wusui
OpenStack setup scripts.
Jason Dillaman [Wed, 18 May 2016 23:19:24 +0000 (19:19 -0400)]
librbd: metadata retrieval added to open image state machine
Fixes: http://tracker.ceph.com/issues/15928
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Jason Dillaman [Wed, 18 May 2016 21:50:07 +0000 (17:50 -0400)]
cls_rbd: async version of metadata_list helper method
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Yehuda Sadeh [Wed, 18 May 2016 23:36:10 +0000 (16:36 -0700)]
Merge pull request #8669 from dreamhost/wip-15532
rgw/s3website: ErrorDoc & Double-fault support
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
Sage Weil [Wed, 18 May 2016 21:07:18 +0000 (17:07 -0400)]
Merge pull request #9150 from stiopaa1/compatset_removeIncludeVector_mc
common: CompatSet.h: remove unneeded #include<vector>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Sage Weil [Wed, 18 May 2016 21:03:52 +0000 (17:03 -0400)]
Merge pull request #9158 from cxwshawn/wip-tc-fix
osd: erase duplicated header include
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Wed, 18 May 2016 21:02:14 +0000 (17:02 -0400)]
Merge pull request #9169 from stiopaa1/osd_hitSetRemoveFormatterInclude
osd/HitSet: remove unneeded #include - Formatter
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Wed, 18 May 2016 21:01:17 +0000 (17:01 -0400)]
Merge pull request #9186 from stiopaa1/osd_fixTypoInComment
osd/OSD.h: fix typo in comment
Michal Jarzabek [Sun, 15 May 2016 08:46:14 +0000 (09:46 +0100)]
osd/OSD.h: fix typo in comment
Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
Yann Dupont [Wed, 18 May 2016 20:30:34 +0000 (22:30 +0200)]
mailmap: Luo Runbing affiliation (was "runsisi", name normalization between Huazhong University of Science and Technology part & ZTE .)
Signed-off-by: Yann Dupont <yann@objoo.org>
Sage Weil [Wed, 18 May 2016 20:25:08 +0000 (16:25 -0400)]
xio: rename enqueue_for_send() to enqueue()Reviewed-by: Sage Weil <sage@redhat.com>
xio: rename enqueue_for_send() to enqueue()
Reviewed-by: Sage Weil <sage@redhat.com>
Yann Dupont [Wed, 18 May 2016 20:24:21 +0000 (22:24 +0200)]
mailmap: Jenkis affiliation (name normalization)
Signed-off-by: Yann Dupont <yann@objoo.org>
Mykola Golub [Wed, 18 May 2016 20:10:02 +0000 (23:10 +0300)]
Merge pull request #9181 from dillaman/wip-rbd-mirror-test
qa/workunits/rbd: fixed rbd_mirror teuthology runtime errors
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
Yann Dupont [Tue, 19 Apr 2016 22:42:21 +0000 (00:42 +0200)]
mailmap: Fangchen Sun affiliation (and name normalisation, was "sunspot")
Signed-off-by: Yann Dupont <yann@objoo.org>
Yann Dupont [Tue, 19 Apr 2016 22:20:35 +0000 (00:20 +0200)]
mailmap: Jacek J. Łakis affiliation (name normalisation)
Signed-off-by: Yann Dupont <yann@objoo.org>
Yann Dupont [Tue, 19 Apr 2016 22:15:34 +0000 (00:15 +0200)]
mailmap: Sangdi Xu affiliation (name normalisation)
Signed-off-by: Yann Dupont <yann@objoo.org>
Yann Dupont [Tue, 19 Apr 2016 21:56:25 +0000 (23:56 +0200)]
mailmap: Roland Mechler affiliation
Signed-off-by: Yann Dupont <yann@objoo.org>