disable api_root and rest_framework.urls in core.urls. These will be handled by plane...

diff --git a/plstackapi/core/urls.py b/plstackapi/core/urls.py
index b34e89a..f1e3ba5 100644 (file)
--- a/plstackapi/core/urls.py
+++ b/plstackapi/core/urls.py
@@ -26,7 +26,7 @@ urlpatterns = patterns('',
     # Uncomment the next line to enable the admin:
     url(r'^admin/', include(admin.site.urls)),
 
-    url(r'^plstackapi/$', api_root),
+    #url(r'^plstackapi/$', api_root),
     
     url(r'^plstackapi/roles/$', RoleListCreate.as_view(), name='role-list'),
     url(r'^plstackapi/roles/(?P<pk>[a-zA-Z0-9]+)/$', RoleRetrieveUpdateDestroy.as_view(), name='role-detail'),
@@ -63,6 +63,6 @@ urlpatterns = patterns('',
     url(r'^plstackapi/flavors/$', FlavorListCreate.as_view(), name='flavor-list'),
     url(r'^plstackapi/flavors/(?P<pk>[a-zA-Z0-9_]+)/$', FlavorRetrieveUpdateDestroy.as_view(), name='flavor-detail'),
     #Adding in rest_framework urls
-    url(r'^plstackapi/', include('rest_framework.urls', namespace='rest_framework')),
+    #url(r'^plstackapi/', include('rest_framework.urls', namespace='rest_framework')),
     
 )