You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by da...@apache.org on 2009/04/18 18:36:59 UTC
svn commit: r766354 - in /couchdb/branches/0.9.x: ./ THANKS
etc/default/couchdb src/couchdb/couch_external_manager.erl
Author: davisp
Date: Sat Apr 18 16:36:59 2009
New Revision: 766354
URL: http://svn.apache.org/viewvc?rev=766354&view=rev
Log:
Merged 766353 from trunk.
Modified:
couchdb/branches/0.9.x/ (props changed)
couchdb/branches/0.9.x/THANKS
couchdb/branches/0.9.x/etc/default/couchdb (props changed)
couchdb/branches/0.9.x/src/couchdb/couch_external_manager.erl
Propchange: couchdb/branches/0.9.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Apr 18 16:36:59 2009
@@ -1,3 +1,3 @@
/couchdb/branches/design_resources:751716-751803
/couchdb/branches/form:729440-730015
-/couchdb/trunk:758717,760442,760503,760532,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,765420,766347
+/couchdb/trunk:758717,760442,760503,760532,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,765420,766347,766353
Modified: couchdb/branches/0.9.x/THANKS
URL: http://svn.apache.org/viewvc/couchdb/branches/0.9.x/THANKS?rev=766354&r1=766353&r2=766354&view=diff
==============================================================================
--- couchdb/branches/0.9.x/THANKS (original)
+++ couchdb/branches/0.9.x/THANKS Sat Apr 18 16:36:59 2009
@@ -25,5 +25,6 @@
* Eric Casteleijn <er...@canonical.com>
* Maarten Thibaut <mt...@cisco.com>
* Florian Ebeling <fl...@gmail.com>
+ * Volker Mische <vo...@gmail.com>
For a list of authors see the `AUTHORS` file.
Propchange: couchdb/branches/0.9.x/etc/default/couchdb
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Apr 18 16:36:59 2009
@@ -1,4 +1,4 @@
/couchdb/branches/design_resources/etc/default/couchdb:751716-751803
/couchdb/branches/form/etc/default/couchdb:729440-730015
-/couchdb/trunk/etc/default/couchdb:758717,760442,760503,760532,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,765420,766347
+/couchdb/trunk/etc/default/couchdb:758717,760442,760503,760532,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,765420,766347,766353
/incubator/couchdb/trunk/etc/default/couchdb:642419-694440
Modified: couchdb/branches/0.9.x/src/couchdb/couch_external_manager.erl
URL: http://svn.apache.org/viewvc/couchdb/branches/0.9.x/src/couchdb/couch_external_manager.erl?rev=766354&r1=766353&r2=766354&view=diff
==============================================================================
--- couchdb/branches/0.9.x/src/couchdb/couch_external_manager.erl (original)
+++ couchdb/branches/0.9.x/src/couchdb/couch_external_manager.erl Sat Apr 18 16:36:59 2009
@@ -53,9 +53,9 @@
[] ->
case couch_config:get("external", UrlName, nil) of
nil ->
- Mesg = lists:flatten(
+ Msg = lists:flatten(
io_lib:format("No server configured for ~p.", [UrlName])),
- {reply, {error, {unknown_external_server, Mesg}}, Handlers};
+ {reply, {error, {unknown_external_server, ?l2b(Msg)}}, Handlers};
Command ->
{ok, NewPid} = couch_external_server:start_link(UrlName, Command),
true = ets:insert(Handlers, {UrlName, NewPid}),