Merge branch 'master' into disable-oauth

zalando · Nov 5, 2018 · a48f8f2 · a48f8f2
2 parents 3395dff + 02bf998
commit a48f8f2
Show file tree

Hide file tree

Showing 281 changed files with 2,999 additions and 3,627 deletions.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -9,7 +9,6 @@ commits.
 ## Review
 - [ ] Tests
 - [ ] Documentation
-- [ ] CHANGELOG
 
 ## Deployment Notes
 These should highlight any db migrations, feature toggles, etc.
diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/Dockerfile b/Dockerfile
@@ -4,7 +4,7 @@ MAINTAINER Team Aruha, [email protected]
 
 WORKDIR /
 ADD build/libs/nakadi.jar nakadi.jar
-ADD api/nakadi-event-bus-api.yaml nakadi-event-bus-api.yaml
+ADD api/nakadi-event-bus-api.yaml api/nakadi-event-bus-api.yaml
 
 EXPOSE 8080