Skip to content

Commit

Permalink
Merge branch 'master' into Fix-issue-with-clusterNames-not-changing
Browse files Browse the repository at this point in the history
  • Loading branch information
Nathan219 authored Jun 30, 2017
2 parents 17d0456 + de0c93e commit 5e96d04
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion configs/.env
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ DOCKER_BUILD_LINE_TIMEOUT_MS=1800000
DOCKER_BUILD_LOG_TAIL_LIMIT=1000000
DOCKER_IMAGE_BUILDER_CACHE=/git-cache
DOCKER_IMAGE_BUILDER_NAME=quay.io/runnable/image-builder
DOCKER_IMAGE_BUILDER_VERSION=v4.6.1
DOCKER_IMAGE_BUILDER_VERSION=v4.6.2
DOCKER_LOG_TAIL_LIMIT=100
DOCKER_TERMINAL_BUFFER=100
DOCKER_TEST_LOG_TAIL_LIMIT=2000
Expand Down
2 changes: 1 addition & 1 deletion npm-shrinkwrap.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "api",
"description": "Runnable API Server",
"version": "12.10.5",
"version": "12.10.6",
"repository": {
"type": "git",
"url": "http://github.com/CodeNow/api.git"
Expand Down

0 comments on commit 5e96d04

Please sign in to comment.