You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ns...@apache.org on 2010/08/11 00:18:04 UTC
svn commit: r984238 - in /couchdb/branches/1.0.x: ./ etc/default/couchdb
src/erlang-oauth/Makefile.am
Author: nslater
Date: Tue Aug 10 22:18:03 2010
New Revision: 984238
URL: http://svn.apache.org/viewvc?rev=984238&view=rev
Log:
backported r984237
Modified:
couchdb/branches/1.0.x/ (props changed)
couchdb/branches/1.0.x/etc/default/couchdb (props changed)
couchdb/branches/1.0.x/src/erlang-oauth/Makefile.am
Propchange: couchdb/branches/1.0.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 10 22:18:03 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:984170,984178,984214,984228
+/couchdb/trunk:984170,984178,984214,984228,984237
Propchange: couchdb/branches/1.0.x/etc/default/couchdb
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 10 22:18:03 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:984170,984178,984214,984228
+/couchdb/trunk/etc/default/couchdb:984170,984178,984214,984228,984237
/incubator/couchdb/trunk/etc/default/couchdb:642419-694440
Modified: couchdb/branches/1.0.x/src/erlang-oauth/Makefile.am
URL: http://svn.apache.org/viewvc/couchdb/branches/1.0.x/src/erlang-oauth/Makefile.am?rev=984238&r1=984237&r2=984238&view=diff
==============================================================================
--- couchdb/branches/1.0.x/src/erlang-oauth/Makefile.am (original)
+++ couchdb/branches/1.0.x/src/erlang-oauth/Makefile.am Tue Aug 10 22:18:03 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 \