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 38B9011712 for ; Tue, 22 Apr 2014 09:47:38 +0000 (UTC) Received: (qmail 57880 invoked by uid 500); 22 Apr 2014 09:47:37 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 57752 invoked by uid 500); 22 Apr 2014 09:47:36 -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 57745 invoked by uid 99); 22 Apr 2014 09:47:34 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 22 Apr 2014 09:47:34 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 9C254839B6B; Tue, 22 Apr 2014 09:47:34 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: rnewson@apache.org To: commits@couchdb.apache.org Message-Id: <4683f234faa44d73965f9fcdc4a63e42@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: chttpd commit: updated refs/heads/1843-feature-bigcouch to dfdee3c Date: Tue, 22 Apr 2014 09:47:34 +0000 (UTC) Repository: couchdb-chttpd Updated Branches: refs/heads/1843-feature-bigcouch faaf44e98 -> dfdee3cd2 Spelling Project: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/commit/dfdee3cd Tree: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/tree/dfdee3cd Diff: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/diff/dfdee3cd Branch: refs/heads/1843-feature-bigcouch Commit: dfdee3cd2f8f5e16f96ce0dee89a6104fd175b36 Parents: faaf44e Author: Robert Newson Authored: Tue Apr 22 10:47:31 2014 +0100 Committer: Robert Newson Committed: Tue Apr 22 10:47:31 2014 +0100 ---------------------------------------------------------------------- src/chttpd_view.erl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/blob/dfdee3cd/src/chttpd_view.erl ---------------------------------------------------------------------- diff --git a/src/chttpd_view.erl b/src/chttpd_view.erl index 85b88a3..83f3d99 100644 --- a/src/chttpd_view.erl +++ b/src/chttpd_view.erl @@ -277,7 +277,7 @@ validate_view_query(start_key, Value, Args) -> case Args#mrargs.multi_get of true -> Msg = <<"Query parameter `start_key` is " - "not compatiible with multi-get">>, + "not compatible with multi-get">>, throw({query_parse_error, Msg}); _ -> Args#mrargs{start_key=Value} @@ -287,8 +287,8 @@ validate_view_query(start_key_docid, Value, Args) -> validate_view_query(end_key, Value, Args) -> case Args#mrargs.multi_get of true-> - Msg = <<"Query paramter `end_key` is " - "not compatibile with multi-get">>, + Msg = <<"Query parameter `end_key` is " + "not compatible with multi-get">>, throw({query_parse_error, Msg}); _ -> Args#mrargs{end_key=Value} @@ -341,7 +341,7 @@ validate_view_query(reduce, _, Args) -> validate_view_query(include_docs, true, Args) -> case Args#mrargs.view_type of reduce -> - Msg = <<"Query paramter `include_docs` " + Msg = <<"Query parameter `include_docs` " "is invalid for reduce views.">>, throw({query_parse_error, Msg}); _ ->