couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rnew...@apache.org
Subject couchdb commit: updated refs/heads/windsor-merge to 6f41536
Date Fri, 22 Aug 2014 15:06:08 GMT
Repository: couchdb
Updated Branches:
  refs/heads/windsor-merge 39d3b5066 -> 6f4153633


Switch to couch_stats


Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/6f415363
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/6f415363
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/6f415363

Branch: refs/heads/windsor-merge
Commit: 6f41536331bb38a31dff76dbb2679356ca156ed1
Parents: 39d3b50
Author: Robert Newson <rnewson@apache.org>
Authored: Fri Aug 22 15:34:08 2014 +0100
Committer: Robert Newson <rnewson@apache.org>
Committed: Fri Aug 22 16:02:04 2014 +0100

----------------------------------------------------------------------
 rebar.config.script         | 1 +
 rel/overlay/etc/default.ini | 3 ---
 2 files changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/6f415363/rebar.config.script
----------------------------------------------------------------------
diff --git a/rebar.config.script b/rebar.config.script
index 456df6e..f080427 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -29,6 +29,7 @@ DepDescs = [
     {couch_dbupdates,   "couch-dbupdates",  {branch, "master"}},
     {couch_plugins,     "couch-plugins",    {branch, "master"}},
     {couch_event,       "couch-event",      {branch, "windsor-merge"}},
+    {couch_stats,       "couch-stats",      {branch, "master"}},
     {docs,              "documentation",    {branch, "master"}, [raw]},
     {ddoc_cache,        "ddoc-cache",       {branch, "windsor-merge"}},
     {ets_lru,           "ets-lru",          {branch, "windsor-merge"}},

http://git-wip-us.apache.org/repos/asf/couchdb/blob/6f415363/rel/overlay/etc/default.ini
----------------------------------------------------------------------
diff --git a/rel/overlay/etc/default.ini b/rel/overlay/etc/default.ini
index 9d69029..54069e8 100644
--- a/rel/overlay/etc/default.ini
+++ b/rel/overlay/etc/default.ini
@@ -154,8 +154,6 @@ external_manager={couch_external_manager, start_link, []}
 query_servers={couch_proc_manager, start_link, []}
 vhosts={couch_httpd_vhost, start_link, []}
 httpd={couch_httpd, start_link, []}
-stats_aggregator={couch_stats_aggregator, start, []}
-stats_collector={couch_stats_collector, start, []}
 uuids={couch_uuids, start, []}
 auth_cache={couch_auth_cache, start_link, []}
 os_daemons={couch_os_daemons, start_link, []}
@@ -175,7 +173,6 @@ _config = {couch_httpd_misc_handlers, handle_config_req}
 _replicate = {couch_replicator_httpd, handle_req}
 _uuids = {couch_httpd_misc_handlers, handle_uuids_req}
 _restart = {couch_httpd_misc_handlers, handle_restart_req}
-_stats = {couch_httpd_stats_handlers, handle_stats_req}
 _session = {couch_httpd_auth, handle_session_req}
 _oauth = {couch_httpd_oauth, handle_oauth_req}
 _db_updates = {couch_dbupdates_httpd, handle_req}


Mime
View raw message