From mboxrd@z Thu Jan 1 00:00:00 1970 From: Willem Jan Withagen Subject: Re: Changes to Rocksdb in tree Date: Fri, 28 Oct 2016 20:18:37 +0200 Message-ID: <8b910192-ed5d-4223-9cca-e716ccce5501@digiware.nl> References: Mime-Version: 1.0 Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Return-path: Received: from smtp.digiware.nl ([176.74.240.9]:57334 "EHLO smtp.digiware.nl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935364AbcJ1SSl (ORCPT ); Fri, 28 Oct 2016 14:18:41 -0400 In-Reply-To: Sender: ceph-devel-owner@vger.kernel.org List-ID: To: Sage Weil Cc: Ceph Development On 28-10-2016 15:38, Willem Jan Withagen wrote: > On 28-10-2016 12:46, Sage Weil wrote: >> On Fri, 28 Oct 2016, Willem Jan Withagen wrote: >>> Hi, >>> >>> Now that we have an In-tree rocksdb: >>> When I have changes to rocksdb how to I get them permanently into the >>> Ceph tree? >>> >>> I submitted the changes upstream to rocksdb. >> >> Once they are merged upstream in rocksdb we will push the commit to >> github.com/ceph/rocksdb and update the submodule. If you like, we can >> cherry-pick the patch in our tree too for the time being (in which case >> you can submit a PR to ceph/rocksdb too). > > his is the PR with rocksdb: > https://github.com/facebook/rocksdb/pull/1428 > > and the commit: > https://github.com/facebook/rocksdb/pull/1428/commits/d1b183561f3238d9e42fff6402813f773c446f67 > > Or do you need it to be in my Ceph fork? Change is in Rocksdb repo. https://github.com/facebook/rocksdb/commit/0aab5e55f0b1808671fa8c58a8c8093fbe32210f --WjW