From 229595384fa063e964645fbc7451d1d19ca331af Mon Sep 17 00:00:00 2001
From: Ryan Thomas <ryan@ryant.org>
Date: Tue, 5 May 2015 20:52:41 +0100
Subject: [PATCH] Bump cabal-install version to v1.20.1.0 and update changelog

---
 cabal-install/cabal-install.cabal | 2 +-
 cabal-install/changelog           | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/cabal-install/cabal-install.cabal b/cabal-install/cabal-install.cabal
index 4415b9b6f8..d45082e065 100644
--- a/cabal-install/cabal-install.cabal
+++ b/cabal-install/cabal-install.cabal
@@ -1,5 +1,5 @@
 Name:               cabal-install
-Version:            1.20.0.6
+Version:            1.20.1.0
 Synopsis:           The command-line interface for Cabal and Hackage.
 Description:
     The \'cabal\' command-line program simplifies the process of managing
diff --git a/cabal-install/changelog b/cabal-install/changelog
index d85bf79d03..f564a0ab6a 100644
--- a/cabal-install/changelog
+++ b/cabal-install/changelog
@@ -1,4 +1,7 @@
 -*-change-log-*-
+1.20.1.0 Ryan Thomas <ryan@ryant.org> May 2015
+	* Force cabal upload to always use digest auth and never basic auth.
+	* bootstrap.sh: install network-uri before HTTP
 
 1.20.0.5 Johan Tibell <johan.tibell@gmail.com> December 2014
 	* Support random 1.1.
-- 
GitLab