Merge branch 'master' into update_puppet

Sergio Oliveira
2 parents d750c5f3 310d050a
Showing 1 changed file with 1 additions and 1 deletions Show diff stats
src/colab/local_settings-dev.py
@@ -32,7 +32,7 @@ DATABASES[&#39;trac&#39;][&#39;HOST&#39;] = &#39;localhost&#39;
  
 HAYSTACK_CONNECTIONS['default']['URL'] = 'http://localhost:8983/solr/'
  
-COLAB_TRAC_URL = 'http://localhost:5000/'
+COLAB_TRAC_URL = 'http://localhost:5000/trac/'
 COLAB_CI_URL = 'http://localhost:8080/ci/'
 COLAB_GITLAB_URL = 'http://localhost:8090/gitlab/'
 COLAB_REDMINE_URL = 'http://localhost:9080/redmine/'
...	...	@@ -32,7 +32,7 @@ DATABASES['trac']['HOST'] = 'localhost'
32	32
33	33	HAYSTACK_CONNECTIONS['default']['URL'] = 'http://localhost:8983/solr/'
34	34
35		-COLAB_TRAC_URL = 'http://localhost:5000/'
	35	+COLAB_TRAC_URL = 'http://localhost:5000/trac/'
36	36	COLAB_CI_URL = 'http://localhost:8080/ci/'
37	37	COLAB_GITLAB_URL = 'http://localhost:8090/gitlab/'
38	38	COLAB_REDMINE_URL = 'http://localhost:9080/redmine/'
...	...