RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-26 13:33:57 +00:00
Code Issues Packages Projects Releases Wiki Activity
52,059 Commits 211 Branches 394 Tags 1.4 GiB
0913938d41
Commit Graph

52059 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Loic Dachary
0913938d41 Merge pull request #8508 from JiYou/fix-ceph-disk 
ceph-disk: do not always fail when re-using a partition

Reviewed-by: Loic Dachary <ldachary@redhat.com>
 2016-04-11 14:44:18 +02:00
Sage Weil
4e2a29ad4e Merge remote-tracking branch 'gh/jewel' 2016-04-11 08:38:27 -04:00
youji
14a66f67db ceph-disk: fix PrepareData.set_type() args should be class member. 
Signed-off-by: You Ji <youji@ebay.com>
 2016-04-11 05:28:43 -07:00
youji
4c203b3a14 ceph-disk: fix spelling mistake geattr to getattr. 
Signed-off-by: You Ji <youji@ebay.com>
 2016-04-11 05:28:43 -07:00
youji
5b098ca0e7 ceph-disk: fix lockbox set_or_create_partition() 
Signed-off-by: You Ji <youji@ebay.com>
 2016-04-11 05:28:13 -07:00
Orit Wasserman
14cec52b26 Merge pull request #8507 from kmroz/wip-rgw-admin-cleanup 
rgw-admin: remove unused iterator and fix error message
 2016-04-11 12:47:12 +02:00
Loic Dachary
b474652070 Merge pull request #8522 from swamireddy/10.1.1-mailmap 
mailmap update

Reviewed-by: Loic Dachary <ldachary@redhat.com>
 2016-04-10 17:14:01 +02:00
Loic Dachary
871cd5a9b9 Merge pull request #8519 from dachary/wip-xenial 
tests: add Ubuntu 16.04 xenial dockerfile

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-04-09 23:19:09 +02:00
Sage Weil
adcc44b7d9 Merge pull request #8517 from kjurka/rgw-admin-doc-region-list 
doc: rgw admin uses "region list" not "regions list"
 2016-04-09 14:21:43 -04:00
Sage Weil
4d954fef85 Merge pull request #8518 from wjin/fix 
crush: fix typo

Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
 2016-04-09 14:21:10 -04:00
Sage Weil
55aeba24b3 Merge pull request #8462 from xiexingguo/xxg-wip-scrub 
osd: fix two scrub relevant issues

Reviewed-by: David Zafman <dzafman@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
 2016-04-09 13:38:20 -04:00
Sage Weil
71b539c821 Merge pull request #8485 from liewegas/wip-fuse-log 
ceph-fuse: rotate log file

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
 2016-04-09 13:35:15 -04:00
Sage Weil
21c9a2406c Merge pull request #8487 from liewegas/wip-copy-from-fail-cleanup 
osd: clean up temp object if copy-from fails

Reviewed-by: Samuel Just <sjust@redhat.com>
 2016-04-09 13:34:39 -04:00
Sage Weil
c672c309ad Merge pull request #8486 from liewegas/wip-14695 
librados: Revert "rados: Add new field flags for ceph_osd_op.copy_get."

Reviewed-by: Samuel Just <sjust@redhat.com>
 2016-04-09 13:33:54 -04:00
Sage Weil
e4eab045b4 Merge pull request #7956 from xiexingguo/xxg-wip-fixfstat 
common: buffer: put a guard for stat() syscall during read_file

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2016-04-09 13:32:57 -04:00
Jason Dillaman
30e943a9a9 Merge pull request #8516 from runsisi/wip-fix-ret 
journal: fix final result for JournalTrimmer::C_RemoveSet

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
 2016-04-09 09:22:12 -04:00
Loic Dachary
8bc8085a00 tests: add Ubuntu 16.04 xenial dockerfile 
Signed-off-by: Loic Dachary <loic@dachary.org>
 2016-04-09 10:18:53 +02:00
Wei Jin
0e4a92e5d0 crush: fix typo 
Signed-off-by: Wei Jin <wjin.cn@gmail.com>
 2016-04-09 14:52:11 +08:00
Kris Jurka
0a622e6054 doc: rgw admin uses "region list" not "regions list" 2016-04-08 21:47:28 -07:00
runsisi
3c772925ca journal: fix final result for JournalTrimmer::C_RemoveSet 
if the first journal object got removed successfully while later objects
failed then the final result should be set to fail

Signed-off-by: runsisi <runsisi@zte.com.cn>
 2016-04-09 11:33:06 +08:00
Orit Wasserman
7a94d9767b Merge pull request #8453 from cbodley/wip-rgw-sync-master-down 
rgw: retry RGWRemoteMetaLog::read_log_info() while master is down
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
 2016-04-08 17:43:25 +02:00
youji
8770043506 ceph-disk: fix set_data_partition() when data is partition. 
Signed-off-by: You Ji <youji@ebay.com>
 2016-04-08 08:17:43 -07:00
Karol Mroz
a330078e29 rgw-admin: fix period delete error message 
Signed-off-by: Karol Mroz <kmroz@suse.com>
 2016-04-08 16:47:40 +02:00
Karol Mroz
3320f8fe31 rgw-admin: remove unused iterator 
Signed-off-by: Karol Mroz <kmroz@suse.com>
 2016-04-08 16:44:34 +02:00
Matt Benjamin
3ea7af87eb Merge pull request #8434 from theanalyst/rgw/typo-fix 
rgw: fix a typo in error message
 2016-04-08 10:39:09 -04:00
Orit Wasserman
3680c0e581 Merge pull request #8481 from weiqiaomiao/wq 
rgw: the map 'headers' is assigned a wrong value
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
 2016-04-08 16:19:29 +02:00
Matt Benjamin
77e0a1b753 Merge pull request #8488 from oritwas/wip-15318 
rgw: fix problem deleting objects begining with double underscores
 2016-04-08 09:57:44 -04:00
Jason Dillaman
b1bc14680c rbd-mirror: fixed infinite loop when disabling image mirroringReviewed-by: Jason Dillaman <dillaman@redhat.com> 
librbd: fixed infinite loop when disabling image mirroring
 2016-04-08 08:36:55 -04:00
Ricardo Dias
64a8a6a1b7 rbd-mirror: fixed bug that caused infinite loop when disabling image mirroring 
Signed-off-by: Ricardo Dias <rdias@suse.com>
 2016-04-08 11:02:42 +01:00
Loic Dachary
e2b8ce4a87 Merge pull request #8501 from dachary/wip-releases 
releases: update the v10.1.0 release link

Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
 2016-04-08 11:41:08 +02:00
Swami Reddy
a651598138 mailmap: Luo Kexue name normalization 
Signed-off-by: M Ranga Swami Reddy <swamireddy@gmail.com>
 2016-04-08 14:57:38 +05:30
Swami Reddy
c36c5d4633 mailmap: Ning Yao affiliation 
Signed-off-by: M Ranga Swami Reddy <swamireddy@gmail.com>
 2016-04-08 14:51:18 +05:30
Swami Reddy
eb536bb279 mailmap: Vitja Makarov affiliation 
Signed-off-by: M Ranga Swami Reddy <swamireddy@gmail.com>
 2016-04-08 14:49:31 +05:30
Loic Dachary
323276e06a release-notes: v10.1.1 release notes 
Signed-off-by: Loic Dachary <loic@dachary.org>
 2016-04-08 11:19:13 +02:00
Loic Dachary
18d06efd80 release-notes: v10.1.1 release notes (draft) 
cd src/script
virtualenv v
source v/bin/activate
pip install githubpy GitPython requests
GITHUB_ACCESS_TOKEN=xxxxxxx ./ceph-release-notes \
      -r tags/v10.1.0..tags/v10.1.1 $(git rev-parse --show-toplevel)

Signed-off-by: Loic Dachary <loic@dachary.org>
 2016-04-08 11:15:03 +02:00
Swami Reddy
1be8dba4f7 mailmap: sunspot affiliation 
Signed-off-by: M Ranga Swami Reddy <swamireddy@gmail.com>
 2016-04-08 14:44:03 +05:30
Swami Reddy
c256a9c673 mailmap: Qinghua Jin affiliation 
Signed-off-by: M Ranga Swami Reddy <swamireddy@gmail.com>
 2016-04-08 14:40:01 +05:30
Swami Reddy
c312b523d8 mailmap: Richard W.M. Jones affiliation 
Signed-off-by: M Ranga Swami Reddy <swamireddy@gmail.com>
 2016-04-08 14:37:16 +05:30
Swami Reddy
b441722bd5 mailmap: Ira Cooper affiliation 
Signed-off-by: M Ranga Swami Reddy <swamireddy@gmail.com>
 2016-04-08 14:31:44 +05:30
Swami Reddy
f4f9d9162d mailmap: Star Guo affiliation 
Signed-off-by: M Ranga Swami Reddy <swamireddy@gmail.com>
 2016-04-08 14:27:57 +05:30
Swami Reddy
ceb2a72503 mailmap: Xiaoxi Chen affiliation 
Signed-off-by: M Ranga Swami Reddy <swamireddy@gmail.com>
 2016-04-08 14:25:49 +05:30
Swami Reddy
885db9512c mailmap: Jenkins name normalization 
Signed-off-by: M Ranga Swami Reddy <swamireddy@gmail.com>
 2016-04-08 14:23:06 +05:30
Loic Dachary
fb63721e42 releases: firefly was EOL december 2015 
Signed-off-by: Loic Dachary <loic@dachary.org>
 2016-04-08 09:54:12 +02:00
Loic Dachary
fc29dc2e68 releases: update the v10.1.0 release link 
And add the v10.1.1 release notes as well.

Signed-off-by: Loic Dachary <loic@dachary.org>
 2016-04-08 09:45:55 +02:00
Dan Mick
872ad16e4a Merge pull request #8500 from linuxbox2/ldap-include 
rgw_ldap: make ldap.h inclusion conditional

Reviewed-by: Dan Mick <dmick@redhat.com>
 2016-04-07 17:43:18 -07:00
Sage Weil
9821b29b75 Merge pull request #8495 from athanatos/wip-14777 
osd/ReplicatedPG::_rollback_to: update the OMAP flag

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-04-07 19:40:56 -04:00
Matt Benjamin
15cabdc537 rgw_ldap: make ldap.h inclusion conditional 
The feature implementation is conditional, embarassingly, the
header inclusion is not.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
 2016-04-07 19:39:40 -04:00
Orit Wasserman
d58e5fee64 rgw: fix problem deleting objects begining with double underscore 
Fixes: http://tracker.ceph.com/issues/15318

Signed-off-by: Orit Wasserman <owasserm@redhat.com>
 2016-04-08 00:48:51 +02:00
Josh Durgin
dfd0856490 Merge pull request #8493 from dillaman/wip-15354 
test: fix valgrind memcheck issues for rbd-mirror test cases

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2016-04-07 14:49:22 -07:00
Josh Durgin
f00ea3f898 Merge pull request #8490 from dillaman/wip-15097 
rbd: journal reset should disable/re-enable journaling feature

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2016-04-07 14:11:10 -07:00