Merge remote-tracking branch 'origin/release' · 3afb89da48 - git.nibbletools.com by Gogs

Merge remote-tracking branch 'origin/release'

Conflicts:
	VERSION
	integration-cli/docker_cli_build_test.go

Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)

Victor Vieux 11 years ago

parent

aec8d90462 ecd20a96df

commit

3afb89da48

2 changed files with 6 additions and 1 deletions

Split View Show Diff Stats

						
							+ 5
							
							- 0
						
CHANGELOG.md
							 
								View File
							
				@@ -1,5 +1,10 @@
			
				 # Changelog
			
				+## 1.1.1 (2014-07-09)
			
				+
			
				+#### Builder
			
				+* Fix issue with ADD
			
				+
			
				 ## 1.1.0 (2014-07-03)
			
				 #### Notable features since 1.0.1

						
							+ 1
							
							- 1
						
VERSION
							 
								View File
							
				@@ -1 +1 @@
			
				-1.1.0-dev
			
				+1.1.1