From 96a1d7c6455b5b4326469f9a51bee869883aac3c Mon Sep 17 00:00:00 2001
From: "Guillaume J. Charmes" <guillaume@dotcloud.com>
Date: Mon, 1 Jul 2013 16:57:58 -0700
Subject: [PATCH 1/2] Bump version to 0.4.8

---
 CHANGELOG.md | 5 +++++
 commands.go  | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4d6a7a00a7..39aa0bcab9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.4.8 (2013-07-01)
+ + Runtime: Add Entrypoint to builder and container config
+ - Runtime: Make sure the ID is displayed when use docker run -d
+ - Tests: Fix issues in the test suite
+
 ## 0.4.7 (2013-06-28)
  * Registry: easier push/pull to a custom registry
  * Remote API: the progress bar updates faster when downloading and uploading large files
diff --git a/commands.go b/commands.go
index 26dbe165c1..6e1e5e88c2 100644
--- a/commands.go
+++ b/commands.go
@@ -28,7 +28,7 @@ import (
 	"unicode"
 )
 
-const VERSION = "0.4.7"
+const VERSION = "0.4.8"
 
 var (
 	GITCOMMIT string

From fe0378e9b36b89d5eb01b4c2bf8c160305a958a7 Mon Sep 17 00:00:00 2001
From: Solomon Hykes <solomon@dotcloud.com>
Date: Mon, 1 Jul 2013 17:05:49 -0700
Subject: [PATCH 2/2] Rephrase changelog

---
 CHANGELOG.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 39aa0bcab9..f4912ae661 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,8 @@
 # Changelog
 
 ## 0.4.8 (2013-07-01)
- + Runtime: Add Entrypoint to builder and container config
- - Runtime: Make sure the ID is displayed when use docker run -d
+ + Builder: New build operation ENTRYPOINT adds an executable entry point to the container.
+ - Runtime: Fix a bug which caused 'docker run -d' to no longer print the container ID.
  - Tests: Fix issues in the test suite
 
 ## 0.4.7 (2013-06-28)