Skip to content

Commit

Permalink
Merge ce75bf7 into d08d989
Browse files Browse the repository at this point in the history
  • Loading branch information
ryanfolsom committed Jan 29, 2015
2 parents d08d989 + ce75bf7 commit 5b49b55
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ core.db

# Distribution / Packaging #
###############################
venv/
build/
dist/
*.egg-info/
4 changes: 2 additions & 2 deletions fabric_bolt/projects/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
url(r'^configuration/update/(?P<pk>\w+)/$', views.ProjectConfigurationUpdate.as_view(), name='projects_configuration_update'),
url(r'^configuration/delete/(?P<pk>\w+)/$', views.ProjectConfigurationDelete.as_view(), name='projects_configuration_delete'),

url(r'^stage/(?P<pk>\d+)/deployment/(?P<task_name>\w+)/$', views.DeploymentCreate.as_view(), name='projects_deployment_create'),
url(r'^stage/(?P<pk>\d+)/deployment/(?P<task_name>\w+((?:\.\w+)+)?)/$', views.DeploymentCreate.as_view(), name='projects_deployment_create'),
url(r'^deployment/view/(?P<pk>\d+)', views.DeploymentDetail.as_view(), name='projects_deployment_detail'),
url(r'^deployment/output/(?P<pk>\d+)', views.DeploymentOutputStream.as_view(), name='projects_deployment_output'),

Expand All @@ -29,4 +29,4 @@
url(r'^(?P<project_id>\w+)/stage/delete/(?P<pk>\w+)/$', views.ProjectStageDelete.as_view(), name='projects_stage_delete'),
url(r'^(?P<project_id>\w+)/stage/(?P<pk>\w+)/host/(?P<host_id>\w+)/$', views.ProjectStageMapHost.as_view(), name='projects_stage_maphost'),
url(r'^stage/(?P<pk>\w+)/host/(?P<host_id>\w+)/$', views.ProjectStageUnmapHost.as_view(), name='projects_stage_unmaphost'),
)
)

0 comments on commit 5b49b55

Please sign in to comment.