release v1.2.0

jtimberman · jtimberman · commit 34cb929504f9 · 2012-12-18T15:51:10.000-07:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## v1.2.0:
+
+* [COOK-1866] - /usr/bin is not a pip binary location in source
+ installs on RHEL
+* [COOK-1925] - add smartos support
+
 ## v1.1.0:
 
 * [COOK-1715] - Add user and group to python_pip
diff --git a/metadata.rb b/metadata.rb
@@ -3,7 +3,7 @@
 maintainer_email "cookbooks@opscode.com"
 license "Apache 2.0"
 description "Installs Python, pip and virtualenv. Includes LWRPs for managing Python packages with `pip` and `virtualenv` isolated Python environments."
-version "1.1.0"
+version "1.2.0"
 
 depends "build-essential"
 depends "yum"

-Original file line number
+Diff line change
@@ @@ -1,3 +1,9 @@ @@
 +## v1.2.0:
++
 +*[COOK-1866] - /usr/bin is not a pip binary location in source
 + installs on RHEL
 +*[COOK-1925] - add smartos support
++
 ## v1.1.0:
 *[COOK-1715] - Add user and group to python_pip
-Original file line number
+Diff line change
 maintainer_email"[email protected]"
 license"Apache 2.0"
 description"Installs Python, pip and virtualenv. Includes LWRPs for managing Python packages with `pip` and `virtualenv` isolated Python environments."
 -version"1.1.0"
 +version"1.2.0"
 depends"build-essential"
 depends"yum"