Return-Path: X-Original-To: apmail-couchdb-commits-archive@www.apache.org Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 0CE189EBA for ; Fri, 2 Mar 2012 17:44:30 +0000 (UTC) Received: (qmail 58323 invoked by uid 500); 2 Mar 2012 17:44:29 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 58288 invoked by uid 500); 2 Mar 2012 17:44:29 -0000 Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list commits@couchdb.apache.org Received: (qmail 58281 invoked by uid 99); 2 Mar 2012 17:44:29 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 Mar 2012 17:44:29 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.114] (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 Mar 2012 17:44:28 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 358BB57B2; Fri, 2 Mar 2012 17:44:08 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jan@apache.org To: commits@couchdb.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [2/3] git commit: Merge branch 'R15B-driver' into 1.2.x Message-Id: <20120302174408.358BB57B2@tyr.zones.apache.org> Date: Fri, 2 Mar 2012 17:44:08 +0000 (UTC) X-Virus-Checked: Checked by ClamAV on apache.org Merge branch 'R15B-driver' into 1.2.x * R15B-driver: Make icu_driver compatible with interface changes in R15B. Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/db8335bf Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/db8335bf Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/db8335bf Branch: refs/heads/1.2.x Commit: db8335bf2a11b915f62894a8e5380c66fedaba34 Parents: 4cd60f3 776aa1d Author: Jan Lehnardt Authored: Fri Mar 2 17:33:02 2012 +0100 Committer: Jan Lehnardt Committed: Fri Mar 2 17:33:02 2012 +0100 ---------------------------------------------------------------------- src/couchdb/priv/icu_driver/couch_icu_driver.c | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 deletions(-) ----------------------------------------------------------------------