42303 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
John Spray	787596dc6d	Merge pull request #4954 from JevonQ/add-iov-support-in-libcephfs ... libcephfs: add ceph_p{read,write}v Reviewed-by: John Spray <john.spray@redhat.com>	2015-06-18 14:26:58 +01:00
Loic Dachary	5cb3cb0958	Merge pull request #4986 from nicolasyong/master ... doc: Modification of a sentence Reviewed-by: Loic Dachary <ldachary@redhat.com>	2015-06-18 15:22:00 +02:00
nicolasyong	33f4b9a05b	doc: Modification of a sentence. ... Fixes : #12057 Signed-off-by: Nicolas Yong <nicolas.yong93@gmail.com>	2015-06-18 15:15:06 +02:00
Loic Dachary	49f093af9a	Merge pull request #4988 from kevincaradant/master ... doc: ceph-deploy man page: typo Reviewed-by: Loic Dachary <ldachary@redhat.com>	2015-06-18 15:01:25 +02:00
Gregory Farnum	459369e700	Merge pull request #4931 from yuyuyu101/wip-perf-msgr ... PerfMsgr: A tool to benchmark messenger module Reviewed-by: Greg Farnum <gfarnum@redhat.com>	2015-06-18 11:09:56 +01:00
Kefu Chai	952836a2f3	Merge pull request #4994 from liewegas/wip-mon-fixes ... mon: fix warning, and get_bucket_utilization Reviewed-by: Kefu Chai <kchai@redhat.com>	2015-06-18 14:59:23 +08:00
Josh Durgin	d87e5e2ea4	Merge pull request #3566 from majianpeng/librbd-cache-iohint ... Librbd cache iohint Reviewed-by: Josh Durgin <jdurgin@redhat.com>	2015-06-17 20:52:49 -07:00
Josh Durgin	4a3f615068	Merge branch 'next'	2015-06-17 20:16:06 -07:00
Josh Durgin	664123890c	Merge remote-tracking branch 'origin/wip-11579' into next ... Reviewed-by: Josh Durgin <jdurgin@redhat.com>	2015-06-17 20:15:25 -07:00
Josh Durgin	9f4c6e479f	Merge branch 'next'	2015-06-17 18:23:11 -07:00
Jason Dillaman	adfa2e0070	librbd: flush operations need to acquire owner lock ... Cache writeback operations will expect the owner lock to be held. Fixes: #11938 Signed-off-by: Jason Dillaman <dillaman@redhat.com> Reviewed-by: Josh Durgin <jdurgin@redhat.com>	2015-06-17 18:22:04 -07:00
Sage Weil	e1619eb3b5	Merge pull request #4990 from ilc/f22-build ... Fix the build on Fedora 22. Reviewed-by: Sage Weil <sage@redhat.com>	2015-06-17 18:15:14 -07:00
Josh Durgin	2314abbfb0	Merge branch 'next'	2015-06-17 18:02:31 -07:00
Josh Durgin	574785c645	Merge remote-tracking branch 'origin/wip-11537' into next ... Reviewed-by: Josh Durgin <jdurgin@redhat.com>	2015-06-17 18:01:20 -07:00
Loic Dachary	789d1ab809	Merge pull request #4992 from maxime1992/master ... doc: Change the type of list in doc Reviewed-by: Loic Dachary <ldachary@redhat.com>	2015-06-18 00:04:09 +02:00
Sage Weil	9298f932b0	mon/OSDMonitor: fix get_bucket_utilization return value ... Broken in cc5f144a51. Signed-off-by: Sage Weil <sage@redhat.com>	2015-06-17 11:57:19 -07:00
Ira Cooper	54a516f633	configure.ac: Fix JUnit 4 detection on Fedora 22. ... This allows the build to detect JUnit 4 on Fedora 22, by adding junit.jar as a valid jar name for JUnit 4. Signed-off-by: Ira Cooper <ira@samba.org>	2015-06-17 13:09:44 -04:00
Maxime ROBERT	7fbac49eb0	doc: Change the type of list in doc ... Fixes: #12061. Signed-off-by: Maxime ROBERT <maxime.robert1992@gmail.com>	2015-06-17 18:37:19 +02:00
Loic Dachary	327e0ac2bd	Merge pull request #4975 from mikulely/master ... Fix typos in librados example code Reviewed-by: Loic Dachary <ldachary@redhat.com>	2015-06-17 18:25:30 +02:00
Kévin CARADANT	05c56b7ced	doc: ceph-deploy man page: typo #12063 ... Replace is initial monitor hostname with is the initial monitor hostname Fixes : #12063 Signed-off-by: CARADANT Kevin <kevin.caradant@gmail.com>	2015-06-17 18:25:08 +02:00
Jiaying Ren	ca285d4d57	Fix typos in librados example code ... Signed-off-by: Jiaying Ren <mikulely@gmail.com>	2015-06-17 23:47:09 +08:00
Loic Dachary	676ff92e18	Merge pull request #4985 from yannick-ad/master ... doc: replace a sentence by another Reviewed-by: Loic Dachary <ldachary@redhat.com>	2015-06-17 17:40:59 +02:00
Loic Dachary	662f75298e	Merge pull request #4979 from GaelFG/patch-1 ... doc: Fixes the description of the purpose of a cache pool Reviewed-by: Loic Dachary <ldachary@redhat.com>	2015-06-17 17:38:06 +02:00
Loic Dachary	ea09f63511	Merge pull request #4984 from LucasFantinel/master ... doc: Wrong restriction for a daemon's ID Reviewed-by: Loic Dachary <ldachary@redhat.com>	2015-06-17 17:36:42 +02:00
yannick-ad	b5d63eb42c	doc: replace a sentence by another ... Fixes: #12060 Signed-off-by: Yannick Atchy-Dalama <yannick.atchy.dalama@gmail.com>	2015-06-17 17:34:30 +02:00
Gaël Fenet-Garde	9cdd810e64	doc: Purpose of a cache pool ... Completing the description of the cache purpose. Fixes : #11096 Signed-off-by: Gael Fenet-Garde <gael.fenet.garde@gmail.com>	2015-06-17 16:52:35 +02:00
unknown	e60c450b3b	doc: Wrong restriction for a daemon's ID ... Fixes: #12058 Signed-off-by: Fantinel Lucas <lucas.fantinel@gmail.com>	2015-06-17 16:17:46 +02:00
branto1	c7da8b29b0	Merge pull request #4920 from SUSE/wip_ceph_spec_mandir ... The file lists in spec files do expect that man pages are built so we better explicitly state that intention in spec file.	2015-06-17 16:16:26 +02:00
branto1	772fbc530e	Merge pull request #4974 from SUSE/wip_ceph_spec_buildep_python_sphinx ... We need this in master to make fedora and rhel7 builds work.	2015-06-17 16:13:10 +02:00
Owen Synge	5e756ed371	ceph_spec buildep python sphinx for fedora ... Fedora, suse as well as centos >= 7 and rhel >= 7 use the same name for python-sphinx so add these conditionals. Note: Until OBS supports EPEL I cant test builds on centos and rhel so this extention of build deps is untested by Owen Synge. Signed-off-by: Owen Synge <osynge@suse.com>	2015-06-17 15:40:17 +02:00
Josh Durgin	6af50f4105	Merge pull request #4948 from vumrao/wip-rbd-11822 ... [rbd] support G/T units in rbd create/resize Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@ril.com> Reviewed-by: Sage Weil <sweil@redhat.com> Reviewed-by: Josh Durgin <jdurgin@redhat.com>	2015-06-16 23:40:26 -07:00
Yehuda Sadeh	a74e485af3	Merge pull request #3894 from rzarzynski/wip-rgw_swift_account_metadata ... rgw: add support for metadata on Swift account Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>	2015-06-16 14:11:38 -07:00
Owen Synge	26eba36f4e	Bug fix for man file packaging. ... Always compile and install man pages when making rpm. Signed-off-by: Owen Synge <osynge@suse.com>	2015-06-16 22:38:02 +02:00
Samuel Just	697a20a0c5	Merge pull request #4833 from liewegas/wip-11500 ... allow very small cursh weights for osds Reviewed-by: Samuel Just <sjust@redhat.com>	2015-06-16 13:27:22 -07:00
Loic Dachary	cc7f767810	Merge pull request #4971 from theanalyst/doc/pgp-num ... doc: explain about pgp num Reviewed-by: Loic Dachary <ldachary@redhat.com>	2015-06-16 22:09:10 +02:00
Alfredo Deza	62bb70dcca	Merge pull request #4968 from tchaikov/wip-update-ceph-deploy-manpage ... doc: sync ceph-deploy's man page with the code Reviewed-by: Alfredo Deza <adeza@redhat.com>	2015-06-16 15:33:32 -04:00
Vikhyat Umrao	8e56a5b5c4	[rbd] support G/T units in rbd create/resize ... Signed-off-by: Vikhyat Umrao <vumrao@redhat.com>	2015-06-16 23:27:52 +05:30
Abhishek Lekshmanan	81eee9bd8c	doc: explain about pgp num ... Explain the significance of pgp num & how it differs from pg num. Fixes: #10035 Reported-by: Loic Dachary <loic@dachary.org> Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@ril.com>	2015-06-16 22:59:22 +05:30
Owen Synge	18ba022617	Bug fix for man file packaging. ... explicitly included man pages. Original fix used %{_mandir}/*/* but this could potentially lead to ambiguity as ceph rpm spec file contains many man pages for different packages. Signed-off-by: Owen Synge <osynge@suse.com>	2015-06-16 17:49:38 +02:00
Sage Weil	485df0cc6d	Merge pull request #4967 from ceph/wip-tarball-11758 ... qa: update to newer Linux tarball	2015-06-16 08:32:32 -07:00
Greg Farnum	1ea3f47ab8	qa: update to newer Linux tarball ... This should make newer gcc releases happier in their default configuration. kernel.org is now distributing tarballs as .xz files so we change to that as well when decompressing (it is supported by Ubuntu Precise so we should be all good). Fixes: #11758 Signed-off-by: Greg Farnum <gfarnum@redhat.com>	2015-06-16 08:15:55 -07:00
Kefu Chai	84e2f8ea99	doc: sync ceph-deploy's man page with the code ... Signed-off-by: Kefu Chai <kchai@redhat.com>	2015-06-16 22:28:58 +08:00
Gregory Farnum	0804655725	Merge pull request #4964 from ceph/wip-12019 ... qa: use "sudo rmdir" to remove test data of multiple_rsync.sh Reviewed-by: Greg Farnum <gfarnum@redhat.com>	2015-06-16 11:08:57 +01:00
Yan, Zheng	905c31e78b	qa: use "sudo rmdir" to remove test data of multiple_rsync.sh ... Fixes: #12019 Signed-off-by: Yan, Zheng <zyan@redhat.com>	2015-06-16 15:06:22 +08:00
Sage Weil	81605bdd1d	Merge pull request #4959 from ceph/wip-crush-compat ... Add crush_compat.h to eliminate ad hoc diff between kernel and userspace Reviewed-by: Sage Weil <sage@redhat.com>	2015-06-15 12:40:14 -07:00
Haomai Wang	ce86b0a27d	doc/messenger: Add doc for ceph_perf_server/client ... Signed-off-by: Haomai Wang <haomaiwang@gmail.com>	2015-06-16 00:54:37 +08:00
Kefu Chai	80e29f19f1	Merge pull request #4956 from oritwas/fix-cmake-2 ... cmake: add missing RadosDump.cc, RadosImport.cc and PoolDump.cc Reviewed-by: Kefu Chai <kchai@redhat.com>	2015-06-16 00:28:58 +08:00
Jevon Qiao	2e7c8e7f5e	libcephfs: add ceph_p{read,write}v ... Fix comments raised by John Spray Signed-off-by: Jevon Qiao <qiaojianfeng@unitedstack.com>	2015-06-15 23:59:12 +08:00
Ilya Dryomov	1db1abc832	crush: eliminate ad hoc diff between kernel and userspace ... - map->choose_tries is not in the kernel - 64-bit/64-bit in the kernel needs a special helper for 32-bit architectures, crush_compat.h provides a stub - INT64_MIN is not in the kernel, crush_compat.h provides S64_MIN - use dprintk inside DEBUG_INDEP sections No functional changes. Signed-off-by: Ilya Dryomov <idryomov@gmail.com>	2015-06-15 18:13:40 +03:00
Ilya Dryomov	69316a9387	crush: add crush_compat.h ... Move all the cruft that is necessary to compile shared files both in kernel and userspace into a new crush_compat.h. Also add a stub for div64_s64() and limits for linux fixed width types. Signed-off-by: Ilya Dryomov <idryomov@gmail.com>	2015-06-15 18:13:40 +03:00