From 1fa4f55304abd1fc7c4546827b6eaf9759a521a6 Mon Sep 17 00:00:00 2001
From: Andre Arko <andre@arko.net>
Date: Fri, 1 Oct 2010 22:54:31 -0700
Subject: [PATCH] Update changelog for 1.0.1

---
 CHANGELOG.md           | 32 +++++++++++++++++++++++++++-----
 lib/bundler/version.rb |  2 +-
 2 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 24844c7b8ee..7a8b33a4113 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,28 @@
-## 1.0.0
+## 1.0.1 (October 1, 2010)
 
-Features
+Features:
+
+  - Vlad deployment recipe, `require 'bundler/vlad'`
+  - Prettier bundle graphs
+  - Improved gem skeleton for `bundle gem`
+  - Prompt on file clashes when generating a gem
+  - Option to generate binary with gem skeleton
+  - Allow subclassing of GemHelper for custom tasks
+  - Chdir to gem directory during `bundle open`
+
+Bugfixes:
+
+  - Allow gemspec requirements with a list of versions
+  - Accept lockfiles with windows line endings
+  - Respect BUNDLE_WITHOUT env var
+  - Allow `gem "foo", :platform => :jruby`
+  - Specify loaded_from path in fake gemspec
+  - Flesh out gem_helper tasks, raise errors correctly
+  - Respect RBConfig::CONFIG['ruby_install_name'] in binstubs
+
+## 1.0.0 (August 29, 2010)
+
+Features:
 
   - You can now define `:bundle_cmd` in the capistrano task
 
@@ -20,7 +42,7 @@ Bugfixes:
   - Detect new Rubygems sources in the Gemfile and update
     the lockfile
 
-## 1.0.0.rc.6
+## 1.0.0.rc.6 (August 23, 2010)
 
 Features:
 
@@ -38,7 +60,7 @@ Bugfixes:
   - Expand paths in Gemfile relative to the Gemfile and not the current
     working directory.
 
-## 1.0.0.rc.5
+## 1.0.0.rc.5 (August 10, 2010)
 
 Features:
 
@@ -49,7 +71,7 @@ Bugfixes:
   - Fix a regression with determining whether or not to use sudo
   - Allow using the --gemfile flag with the --deployment flag
 
-## 1.0.0.rc.4
+## 1.0.0.rc.4 (August 9, 2010)
 
 Features:
 
diff --git a/lib/bundler/version.rb b/lib/bundler/version.rb
index d6e25ef3866..aba62a7250e 100644
--- a/lib/bundler/version.rb
+++ b/lib/bundler/version.rb
@@ -2,5 +2,5 @@ module Bundler
   # We're doing this because we might write tests that deal
   # with other versions of bundler and we are unsure how to
   # handle this better.
-  VERSION = "1.1.pre" unless defined?(::Bundler::VERSION)
+  VERSION = "1.0.1" unless defined?(::Bundler::VERSION)
 end