From 7220044b49914abfdaf1d5634164847192343393 Mon Sep 17 00:00:00 2001
From: Yamashita Yuu <peek824545201@gmail.com>
Date: Thu, 6 Nov 2014 09:41:22 -0800
Subject: [PATCH] v20141106

---
 CHANGELOG.md            | 13 +++++++++++--
 libexec/pyenv---version |  2 +-
 test/pyenv.bats         |  2 +-
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index edb4e20f..07e9d2e4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,14 @@
 ## Version History
 
+#### 20141106
+
+* pyenv: Optimize pyenv-which. Thanks to @blueyed (#129)
+* python-build: Add Miniconda/Miniconda3 3.7.0 and Anaconda/Anaconda3 2.1.0 (#260)
+* python-build: Use HTTPS for mirror download URLs (#262)
+* python-build: Set `rpath` for `--shared` build of PyPy (#244)
+* python-build: Support `make altinstall` when building CPython/Stackless (#255)
+* python-build: Import recent changes from ruby-build v20141028 (#265)
+
 #### 20141012
 
 * python-build: Add new CPython releases; 3.2.6, 3.3.6 (#253)
@@ -16,7 +25,7 @@
 
 #### 20140924
 
-* pyenv: Fix an unintended behavior when user does not have write permission on $PYENV_ROOT (#230)
+* pyenv: Fix an unintended behavior when user does not have write permission on `$PYENV_ROOT` (#230)
 * pyenv: Fix a zsh completion issue (#232)
 * python-build: Add new PyPy release; pypy-2.4.0, pypy-2.4.0-src (#241)
 
@@ -25,7 +34,7 @@
 * pyenv: Fix zsh completion with multiple words (#215)
 * python-build: Display the package name of `hg` as `mercurial` in message (#212)
 * python-build: Unset `PIP_REQUIRE_VENV` during build (#216)
-* python-build: Set MACOSX_DEPLOYMENT_TARGET from the product version of OS X (#219, #220)
+* python-build: Set `MACOSX_DEPLOYMENT_TARGET` from the product version of OS X (#219, #220)
 * python-build: Add new Jython release; jython2.7-beta3 (#223)
 
 #### 20140705
diff --git a/libexec/pyenv---version b/libexec/pyenv---version
index ec658cb9..5cdfbc81 100755
--- a/libexec/pyenv---version
+++ b/libexec/pyenv---version
@@ -12,7 +12,7 @@
 set -e
 [ -n "$PYENV_DEBUG" ] && set -x
 
-version="20141012"
+version="20141106"
 
 if cd "$PYENV_ROOT" 2>/dev/null; then
   git_revision="$(git describe --tags HEAD 2>/dev/null || true)"
diff --git a/test/pyenv.bats b/test/pyenv.bats
index 213d6017..811f3cc5 100644
--- a/test/pyenv.bats
+++ b/test/pyenv.bats
@@ -5,7 +5,7 @@ load test_helper
 @test "blank invocation" {
   run pyenv
   assert_success
-  assert [ "${lines[0]}" == "pyenv 20141012" ]
+  assert [ "${lines[0]}" == "pyenv 20141106" ]
 }
 
 @test "invalid command" {