diff options
| author | Randall Leeds <randall@apache.org> | 2011-06-08 07:53:55 +0000 |
|---|---|---|
| committer | Randall Leeds <randall@apache.org> | 2011-06-08 07:53:55 +0000 |
| commit | ea57780780730eb5f2d98f30697e6a8c2b3cf7f7 (patch) | |
| tree | ead08c2be8efadce9d7cbc6d6d254ac0f32030bb /src | |
| parent | cee8283b7e0e5d6c330398f9b6d9ffe5ebc4fe9a (diff) | |
bump minimum erlang to R13B02 (COUCHDB-1191)
git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1133272 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src')
| -rw-r--r-- | src/couchdb/couch_app.erl | 3 | ||||
| -rw-r--r-- | src/erlang-oauth/Makefile.am | 4 |
2 files changed, 1 insertions, 6 deletions
diff --git a/src/couchdb/couch_app.erl b/src/couchdb/couch_app.erl index 232953d9..c16412a3 100644 --- a/src/couchdb/couch_app.erl +++ b/src/couchdb/couch_app.erl @@ -48,9 +48,6 @@ start_apps([App|Rest]) -> start_apps(Rest); {error, {already_started, App}} -> start_apps(Rest); - {error, _Reason} when App =:= public_key -> - % ignore on R12B5 - start_apps(Rest); {error, _Reason} -> {error, {app_would_not_start, App}} end. diff --git a/src/erlang-oauth/Makefile.am b/src/erlang-oauth/Makefile.am index 48b76482..76239484 100644 --- a/src/erlang-oauth/Makefile.am +++ b/src/erlang-oauth/Makefile.am @@ -22,15 +22,13 @@ oauth_file_collection = \ 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 \ oauth_hmac_sha1.beam \ oauth_http.beam \ oauth_plaintext.beam \ + oauth_rsa_sha1.erl \ oauth_unix.beam \ oauth_uri.beam |