couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nsla...@apache.org
Subject svn commit: r984239 - in /couchdb/branches/0.11.x: ./ etc/default/couchdb src/erlang-oauth/Makefile.am
Date Tue, 10 Aug 2010 22:18:39 GMT
Author: nslater
Date: Tue Aug 10 22:18:39 2010
New Revision: 984239

URL: http://svn.apache.org/viewvc?rev=984239&view=rev
Log:
backported r984237

Modified:
    couchdb/branches/0.11.x/   (props changed)
    couchdb/branches/0.11.x/etc/default/couchdb   (props changed)
    couchdb/branches/0.11.x/src/erlang-oauth/Makefile.am

Propchange: couchdb/branches/0.11.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 10 22:18:39 2010
@@ -6,4 +6,4 @@
 /couchdb/branches/list-iterator:782292-784593
 /couchdb/branches/tail_header:775760-778477
 /couchdb/tags/0.10.0:825400
-/couchdb/trunk:909247,910054,910696,910910-910911,911544,911559,911578,911602,911717,911837,912474,912606,912608,912615,912636,915526,915529-915530,915827,916076,916153,916518,916521,917553,918855,919193,921707,923526,925264,931655,933039,936889,941451,946400,955000,984170,984178,984214,984228
+/couchdb/trunk:909247,910054,910696,910910-910911,911544,911559,911578,911602,911717,911837,912474,912606,912608,912615,912636,915526,915529-915530,915827,916076,916153,916518,916521,917553,918855,919193,921707,923526,925264,931655,933039,936889,941451,946400,955000,984170,984178,984214,984228,984237

Propchange: couchdb/branches/0.11.x/etc/default/couchdb
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 10 22:18:39 2010
@@ -6,5 +6,5 @@
 /couchdb/branches/list-iterator/etc/default/couchdb:782292-784593
 /couchdb/branches/tail_header/etc/default/couchdb:775760-778477
 /couchdb/tags/0.10.0/etc/default/couchdb:825400
-/couchdb/trunk/etc/default/couchdb:909247,910054,910696,911544,911602,911717,911837,912474,912606,912608,912615,912636,915526,915529-915530,915827,916076,916153,916518,916521,917553,918855,919193,921707,923526,925264,931655,933039,936889,941451,946400,955000,984170,984178,984214,984228
+/couchdb/trunk/etc/default/couchdb:909247,910054,910696,911544,911602,911717,911837,912474,912606,912608,912615,912636,915526,915529-915530,915827,916076,916153,916518,916521,917553,918855,919193,921707,923526,925264,931655,933039,936889,941451,946400,955000,984170,984178,984214,984228,984237
 /incubator/couchdb/trunk/etc/default/couchdb:642419-694440

Modified: couchdb/branches/0.11.x/src/erlang-oauth/Makefile.am
URL: http://svn.apache.org/viewvc/couchdb/branches/0.11.x/src/erlang-oauth/Makefile.am?rev=984239&r1=984238&r2=984239&view=diff
==============================================================================
--- couchdb/branches/0.11.x/src/erlang-oauth/Makefile.am (original)
+++ couchdb/branches/0.11.x/src/erlang-oauth/Makefile.am Tue Aug 10 22:18:39 2010
@@ -12,18 +12,19 @@
 
 oauthebindir = $(localerlanglibdir)/erlang-oauth/ebin
 
-# Removed oauth_rsa_sha1.erl until we require R12B5 or
-# we add a ./configure option to enable it.
-
 oauth_file_collection = \
 	oauth.app.in \
     oauth.erl \
     oauth_hmac_sha1.erl \
     oauth_http.erl \
     oauth_plaintext.erl \
+    oauth_rsa_sha1.erl \
     oauth_unix.erl \
     oauth_uri.erl
 
+# Removed oauth_rsa_sha1.beam until we require R12B5 or
+# we add a ./configure option to enable it.
+
 oauthebin_make_generated_file_list = \
 	oauth.app \
     oauth.beam \



Mime
View raw message