From 1d0c16dddc2861e4e094e488cc357d7c95f584ef Mon Sep 17 00:00:00 2001 From: Ant Zucaro Date: Sat, 14 Jun 2014 08:04:24 -0400 Subject: [PATCH] Disable the merge view for now. --- xonstat/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xonstat/__init__.py b/xonstat/__init__.py index da42ca3..6186a67 100644 --- a/xonstat/__init__.py +++ b/xonstat/__init__.py @@ -166,7 +166,7 @@ def main(global_config, **settings): config.add_route("login", "/login") config.add_view(login, route_name="login", check_csrf=True, renderer="json") - config.add_route("merge", "/merge") - config.add_view(merge, route_name="merge", renderer="merge.mako") + #config.add_route("merge", "/merge") + #config.add_view(merge, route_name="merge", renderer="merge.mako") return config.make_wsgi_app() -- 2.39.2