Skip to content
This repository has been archived by the owner on Feb 27, 2020. It is now read-only.

Commit

Permalink
Merge remote-tracking branch 'origin/master' into etcd
Browse files Browse the repository at this point in the history
Conflicts:
	README.md
	minimal-distributed.yaml
  • Loading branch information
rkd-msw committed Apr 29, 2016
2 parents 2dadd03 + 0e88507 commit ae892d7
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 2 deletions.
22 changes: 22 additions & 0 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<!--
This page is for reporting issues with Project Clearwater. If you have a question, rather than a bug report, the mailing list at clearwater@lists.projectclearwater.org is a better place for it.
To give us the best chance of fixing the problem, we've suggested some information to give - please follow these guidelines if possible.
Don't forget that you can attach logs and screenshots to Github issues - this may help us debug a problem.
-->

#### Symptoms
<!-- What exactly went wrong? (If possible, copy and paste the exact output you saw) -->


#### Impact
<!-- What is this preventing you from doing? Does this stop Clearwater working, or stop some calls being processed? -->


#### Release and environment
<!-- For example: the "Doom" release, whether you're on VMware or OpenStack, etc. -->


#### Steps to reproduce

2 changes: 1 addition & 1 deletion base/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ ENV LC_ALL en_US.UTF-8
COPY sysctl /sbin/sysctl
RUN sed -e 's/\#\(precedence ::ffff:0:0\/96 100\)/\1/g' -i /etc/gai.conf

RUN echo deb http://repo.cw-ngv.com/stable binary/ > /etc/apt/sources.list.d/clearwater.list
RUN echo deb http://repo.cw-ngv.com/archive/repo92 binary/ > /etc/apt/sources.list.d/clearwater.list
RUN curl -L http://repo.cw-ngv.com/repo_key | apt-key add -
RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --force-yes clearwater-infrastructure clearwater-auto-config-docker clearwater-management
RUN /etc/init.d/clearwater-auto-config-docker restart
Expand Down
1 change: 0 additions & 1 deletion minimal-distributed.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -54,4 +54,3 @@ services:
ports:
- 22
- "80:80"

0 comments on commit ae892d7

Please sign in to comment.