From 2306721c234c1e1c9c38e896f6752ff396df01f5 Mon Sep 17 00:00:00 2001
From: Miek Gieben <miek@miek.nl>
Date: Tue, 10 Jul 2018 12:28:29 +0100
Subject: [PATCH] Up release to 1.2.0 (#1958)

Automatically submitted.
---
 Makefile.release    | 4 ++--
 coremain/version.go | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile.release b/Makefile.release
index 1310bc6af..9576bf80f 100644
--- a/Makefile.release
+++ b/Makefile.release
@@ -86,7 +86,7 @@ tar:
 .PHONY: github-push
 upload:
 	@echo Releasing: $(VERSION)
-	$(eval RELEASE:=$(shell curl -s -d '{"tag_name": "v$(VERSION)", "name": "v$(VERSION)"}' "https://api.github.com/repos/$(GITHUB)/$(NAME)/releases?access_token=${GITHUB_ACCESS_TOKEN}" | grep -m 1 '"id"' | tr -cd '[[:digit:]]'))
+	@$(eval RELEASE:=$(shell curl -s -d '{"tag_name": "v$(VERSION)", "name": "v$(VERSION)"}' "https://api.github.com/repos/$(GITHUB)/$(NAME)/releases?access_token=${GITHUB_ACCESS_TOKEN}" | grep -m 1 '"id"' | tr -cd '[[:digit:]]'))
 	@echo ReleaseID: $(RELEASE)
 	@for asset in `ls -A release`; do \
 	    curl -o /dev/null -X POST \
@@ -111,7 +111,7 @@ docker-build: tar
 
 .PHONY: docker-push
 docker-push:
-	docker -u $(DOCKER_LOGIN) -p $(DOCKER_PASSWORD) || exit 1
+	@docker -u $(DOCKER_LOGIN) -p $(DOCKER_PASSWORD) || exit 1
 	@echo Pushing: $(VERSION) to $(DOCKER_IMAGE_NAME)
 	for arch in $(LINUX_ARCH); do \
 	    docker push $(DOCKER_IMAGE_NAME):coredns-$$arch ;\
diff --git a/coremain/version.go b/coremain/version.go
index e881d8674..7e73e5adb 100644
--- a/coremain/version.go
+++ b/coremain/version.go
@@ -2,7 +2,7 @@ package coremain
 
 // Various CoreDNS constants.
 const (
-	CoreVersion = "1.1.4"
+	CoreVersion = "1.2.0"
 	coreName    = "CoreDNS"
 	serverType  = "dns"
 )