Commit Graph

48480 Commits

Author SHA1 Message Date
Yann Dupont
afcc66666c mailmap: Erwan Velu affiliation
Signed-off-by: Yann Dupont <yann@objoo.org>
2016-02-09 11:05:17 +01:00
Yann Dupont
28c210806e mailmap: Barbora Ančincová affiliation
Signed-off-by: Yann Dupont <yann@objoo.org>
2016-02-09 11:05:11 +01:00
Yann Dupont
3fe17c6c9d mailmap: fangdong affiliation
Signed-off-by: Yann Dupont <yann@objoo.org>
2016-02-08 23:40:57 +01:00
Yann Dupont
833c8e2bd2 mailmap: Jingkai Yuan affiliation
Signed-off-by: Yann Dupont <yann@objoo.org>
2016-02-08 23:36:32 +01:00
Yann Dupont
303924828c mailmap: Harry Harrington affiliation
Signed-off-by: Yann Dupont <yann@objoo.org>
2016-02-08 23:36:32 +01:00
Yann Dupont
2a35e185ea mailmap: Tao Chang affiliation
Signed-off-by: Yann Dupont <yann@objoo.org>
2016-02-08 23:36:32 +01:00
Yann Dupont
ab6baa95f2 mailmap: Shishir Gowda affiliation
Signed-off-by: Yann Dupont <yann@objoo.org>
2016-02-08 23:36:32 +01:00
Yann Dupont
78d91d6eb1 mailmap: Adam Twardowski affiliation
Signed-off-by: Yann Dupont <yann@objoo.org>
2016-02-08 23:36:31 +01:00
Yann Dupont
e8e0521c30 mailmap: Shun Song affiliation
Signed-off-by: Yann Dupont <yann@objoo.org>
2016-02-08 23:36:31 +01:00
Yann Dupont
5bda3a254c mailmap: some duplicates found on .organizationmap
Signed-off-by: Yann Dupont <yann@objoo.org>
2016-02-08 23:36:31 +01:00
Yann Dupont
f59db3cf6d mailmap: Luo Kexue affiliation
Signed-off-by: Yann Dupont <yann@objoo.org>
2016-02-08 23:36:31 +01:00
Yann Dupont
588eeea462 mailmap: Aron Gunn affiliation
Signed-off-by: Yann Dupont <yann@objoo.org>
2016-02-08 23:36:25 +01:00
Yann Dupont
8556b9d533 mailmap: further cleanup.
Somehow a followup to #581c65dd48807a516b43adec4b5be29c040db8c7

Work was half-done, and mailmap can be further simplified without changing outpout of the script credits.sh

Signed-off-by: Yann Dupont <yann@objoo.org>
2016-02-08 22:00:10 +01:00
Yann Dupont
17d2622b28 mailmap: Abhishek Lekshmanan affiliation
Signed-off-by: Yann Dupont <yann@objoo.org>
2016-02-08 22:00:10 +01:00
Yann Dupont
467990a5b7 mailmap: Darrell Enns affiliation
Signed-off-by: Yann Dupont <yann@objoo.org>
2016-02-08 22:00:10 +01:00
Yann Dupont
2a3ce4ef8e mailmap: Ilya Shipitsin affiliation
Signed-off-by: Yann Dupont <yann@objoo.org>
2016-02-08 22:00:10 +01:00
Yann Dupont
b57a3ac17f mailmap: Li Tianqing affiliation
Signed-off-by: Yann Dupont <yann@objoo.org>
2016-02-08 22:00:10 +01:00
Yann Dupont
eaf5bc7d99 mailmap: Yehua Chen affiliation
Signed-off-by: Yann Dupont <yann@objoo.org>
2016-02-08 22:00:10 +01:00
Yann Dupont
ac61c11264 mailmap: Ren Huanwen affiliation
Signed-off-by: Yann Dupont <yann@objoo.org>
2016-02-08 22:00:10 +01:00
Yann Dupont
20783f8315 mailmap: YiQiang Chen affiliation
Signed-off-by: Yann Dupont <yann@objoo.org>
2016-02-08 21:46:51 +01:00
Yann Dupont
c423d5fc9d mailmap: Zhi Zhang affiliation
Signed-off-by: Yann Dupont <yann@objoo.org>
2016-02-08 21:46:51 +01:00
Yann Dupont
f5bcdae817 mailmap: François Lafont affiliation
Signed-off-by: Yann Dupont <yann@objoo.org>
2016-02-08 21:46:42 +01:00
Yann Dupont
10bb9a45ac mailmap: Liu Peiyan affiliation
Signed-off-by: Yann Dupont <yann@objoo.org>
2016-02-08 21:45:15 +01:00
Yann Dupont
638c636979 mailmap: Dunrong Huang affiliation
Signed-off-by: Yann Dupont <yann@objoo.org>
2016-02-08 21:45:15 +01:00
Yann Dupont
0fe937368b mailmap: Xie Xingguo affiliation
Signed-off-by: Yann Dupont <yann@objoo.org>
2016-02-08 21:45:15 +01:00
Yann Dupont
f960bcc4c1 mailmap: Song Baisen affiliation
Signed-off-by: Yann Dupont <yann@objoo.org>
2016-02-08 21:45:15 +01:00
Yann Dupont
c2e0b8f107 mailmap: Zhiqiang Wang affiliation
Signed-off-by: Yann Dupont <yann@objoo.org>
2016-02-08 21:45:15 +01:00
Yann Dupont
84f58b57d7 mailmap: Xiangwei Wu affiliation
Signed-off-by: Yann Dupont <yann@objoo.org>
2016-02-08 21:45:15 +01:00
Yann Dupont
fcd3bba641 mailmap: Adam C. Emerson affiliation
Signed-off-by: Yann Dupont <yann@objoo.org>
2016-02-08 21:45:15 +01:00
Yann Dupont
b5d768864e mailmap: Cleanup.
Over time, some entries were unnecessarily complicated.

Entries were sometimes of the form :

Canonical name <canonical@email> first other name <other@mail1>
Canonical name <canonical@email> second other name <other@mail1>
Canonical name <canonical@email> OOops my mailer is wrongly configured <other@mail1>
...

This can be simplified like this :
Canonical name <canonical@email>
Canonical name <canonical@email> <other@mail1>

The added benefit is that we're now exempt of adding a line in .mailmap every time an author make a typo. That will save us time.

Also for name normalisation, a single entry Canonical name <complicated@email> is often enough.

Signed-off-by: Yann Dupont <yann@objoo.org>
2016-02-08 21:44:33 +01:00
Samuel Just
4453b46205 Merge pull request #7507 from tchaikov/wip-cmake
cmake: add KernelDevice.cc to libos_srcs

Reviewed-by: Samuel Just <sjust@redhat.com>
2016-02-03 10:40:11 -08:00
Kefu Chai
82637be7e5 cmake: add KernelDevice.cc to libos_srcs
which fixes the build

Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-02-04 01:28:21 +08:00
Sage Weil
2aeadc9acf Merge remote-tracking branch 'gh/jewel' 2016-02-03 09:46:47 -05:00
Sage Weil
cc2ce6ad1a Merge branch 'wip-rados-bench' 2016-02-03 09:46:12 -05:00
Gu Zhongyan
669b932934 rados: Add units to rados bench output
Fixes: #12248
Signed-off-by: Gu Zhongyan <guzhongyan@360.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2016-02-03 09:45:55 -05:00
Sage Weil
bf77308416 Merge pull request #7386 from liewegas/wip-features
osd: skip redirect encoding if we can

Reviewed-by: Sage Weil <sage@redhat.com>
2016-02-03 09:44:28 -05:00
Sage Weil
e478a4f2a7 Merge branch 'weighted-priority-queue' of git://github.com/rldleblanc/ceph
Reviewed-by: Samuel Just <sjust@redhat.com>
2016-02-03 08:53:22 -05:00
Sage Weil
9a80477432 Merge branch 'gelf-logging-backend' of git://github.com/irq0/ceph
Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-02-03 08:48:26 -05:00
Sage Weil
e85ffacb28 scripts/run-coverity: fix upload process
Signed-off-by: Sage Weil <sage@redhat.com>
2016-02-03 08:47:57 -05:00
Sage Weil
2e6db00dcb Merge pull request #7357 from zhengbinh3c/master
osd: fix memory leak in ReplicatedPG.cc error path

Reviewed-by: Sage Weil <sage@redhat.com>
2016-02-03 08:52:02 -05:00
Sage Weil
178c52acf2 Merge pull request #7362 from xiexingguo/xxg-wip-fixbs
osd: BlueStore: fix fsck and blockdevice read-relevant issue

Reviewed-by: Sage Weil <sage@redhat.com>
2016-02-03 08:50:46 -05:00
Sage Weil
680a999f42 Merge pull request #7468 from liewegas/wip-test-fuse
qa/workunits/objectstore/test_fuse.sh: fix root check
2016-02-03 08:49:37 -05:00
Sage Weil
6c9a35b22a Merge pull request #7476 from tchaikov/wip-include-expat-in-source
rgw: do not include "expat.h" in header file

Reviewed-by: Sage Weil <sage@redhat.com>
2016-02-03 08:49:28 -05:00
Sage Weil
a76755c427 Merge pull request #7479 from roidayan/fix_xio_compilation
msg/xio: fix compilation
2016-02-03 08:48:54 -05:00
Sage Weil
06cecb4b90 ceph_test_objectstore: fix warning
Signed-off-by: Sage Weil <sage@redhat.com>
2016-02-02 11:08:09 -05:00
Sage Weil
9a349338f0 os/bluestore/KernelDevice: explicit on ctor
This was lost in the wip-spdk merge.

Signed-off-by: Sage Weil <sage@redhat.com>
2016-02-02 11:03:48 -05:00
Sage Weil
d3925a50e3 Merge pull request #7467 from liewegas/wip-scrub-start
osd: fix scrub start hobject
2016-02-02 11:03:14 -05:00
Sage Weil
87efba42fe Merge branch 'wip-spdk' of git://github.com/yuyuyu101/ceph
Reviewed-by: Sage Weil <sage@redhat.com>
2016-02-02 11:02:12 -05:00
Sage Weil
dc50f31079 Merge remote-tracking branch 'me/wip-lockdep' 2016-02-02 11:00:37 -05:00
Sage Weil
75395c11e9 Merge pull request #7438 from ifed01/wip-pgbackend-cleanup
osd: cleanup OSD/PGBackend interface a bit

Reviewed-by: Sage Weil <sage@redhat.com>
2016-02-02 11:03:51 -05:00