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 25CEB18D7C for ; Mon, 21 Dec 2015 22:03:49 +0000 (UTC) Received: (qmail 57728 invoked by uid 500); 21 Dec 2015 22:03:49 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 57678 invoked by uid 500); 21 Dec 2015 22:03:49 -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 57669 invoked by uid 99); 21 Dec 2015 22:03:48 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 21 Dec 2015 22:03:48 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id CC14EE07BA; Mon, 21 Dec 2015 22:03:48 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: kxepal@apache.org To: commits@couchdb.apache.org Message-Id: <5477552e981e4fd8bae3554c3da201a1@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: couchdb commit: updated refs/heads/master to 4bd9e7e Date: Mon, 21 Dec 2015 22:03:48 +0000 (UTC) Repository: couchdb Updated Branches: refs/heads/master 37f4d5588 -> 4bd9e7e4c Move config to the top as it defines custom behavior Which is used by couch_log now, causing compilation warning. However, following alphabet ordering config have to be put before couch_log anyway. Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/4bd9e7e4 Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/4bd9e7e4 Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/4bd9e7e4 Branch: refs/heads/master Commit: 4bd9e7e4cec8221e9fde5c9c224b06ff704342d5 Parents: 37f4d55 Author: Alexander Shorin Authored: Tue Dec 22 01:00:12 2015 +0300 Committer: Alexander Shorin Committed: Tue Dec 22 01:01:31 2015 +0300 ---------------------------------------------------------------------- rebar.config.script | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/4bd9e7e4/rebar.config.script ---------------------------------------------------------------------- diff --git a/rebar.config.script b/rebar.config.script index ecb773b..4dcdaa0 100644 --- a/rebar.config.script +++ b/rebar.config.script @@ -24,12 +24,12 @@ os:putenv("COUCHDB_APPS_CONFIG_DIR", filename:join([COUCHDB_ROOT, "rel/apps"])). DepDescs = [ %% must be compiled first as it has a custom behavior {couch_epi, "couch-epi", "807aa3f58e39f1273e732020c80d630d9177790c"}, +{config, "config", "84197a6f1c5cb43447239df1fe57b4312b0c03c4"}, %% keep these sorted {b64url, "b64url", "319fc604235ab1fde37047b38a432450161db750"}, {cassim, "cassim", "ab1ef1cee5f7b7ec1733e44845c1df99fc7a66a3"}, {couch_log, "couch-log", "939b3a7bda7dcb03f841b899762b188ca31bc230"}, {couch_log_lager, "couch-log-lager", "b2a0471a87765de50c5eb05c65c121f68a9ae9fa"}, -{config, "config", "84197a6f1c5cb43447239df1fe57b4312b0c03c4"}, {chttpd, "chttpd", "417679a9cf2277693253d3f9c2ac0e52fa1ba75c"}, {couch, "couch", "f33f9fa1281fd6c50a86cb9853bd2d9ec2dd007c"}, {couch_index, "couch-index", "14f579dcd142ee90300244c854b301bbd5c863ee"},