From 89d8bf50a96ba7df0b59bb22278b6a780fcb577f Mon Sep 17 00:00:00 2001
From: Daniel Quinn <code@danielquinn.org>
Date: Tue, 15 Dec 2015 14:50:50 +0000
Subject: [PATCH 1/3] Added changelog for 1.2

---
 CHANGES.rst | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index 1c7a4c6..9a72851 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,6 +1,15 @@
 Release History
 ===============
 
+1.2.0 (released 2015-12-15)
+---------------------------
+
+Output Changes
+~~~~~~~~~~~~~~
+- `#119`_: Support HTTP results.
+- `#122`_: Allow packagers to set the user agent.
+
+
 1.1.1 (released 2015-11-25)
 ---------------------------
 
@@ -37,3 +46,5 @@ Changes
 
 .. _#103: https://github.com/RIPE-NCC/ripe-atlas-tools/issues/103
 .. _#105: https://github.com/RIPE-NCC/ripe-atlas-tools/issues/105
+.. _#119: https://github.com/RIPE-NCC/ripe-atlas-tools/issues/119
+.. _#122: https://github.com/RIPE-NCC/ripe-atlas-tools/issues/122

From 5bc695d2e1ee7906a6d6837c22d1c837efdd374c Mon Sep 17 00:00:00 2001
From: Daniel Quinn <code@danielquinn.org>
Date: Tue, 15 Dec 2015 14:51:06 +0000
Subject: [PATCH 2/3] Version bump for Sagan & Cousteau

---
 setup.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.py b/setup.py
index ac0694d..828d30a 100644
--- a/setup.py
+++ b/setup.py
@@ -33,8 +33,8 @@
     install_requires=[
         "python-dateutil",
         "requests>=2.7.0",
-        "ripe.atlas.cousteau>=1.0.4",
-        "ripe.atlas.sagan>=1.1.6",
+        "ripe.atlas.cousteau>=1.0.6",
+        "ripe.atlas.sagan>=1.1.8",
         "tzlocal",
         "pyyaml",
         "pyOpenSSL>=0.13",

From eeb5b031992e3e6ea2cf2cacb4937ca438692d1a Mon Sep 17 00:00:00 2001
From: Daniel Quinn <code@danielquinn.org>
Date: Tue, 15 Dec 2015 14:51:36 +0000
Subject: [PATCH 3/3] Version bump

---
 ripe/atlas/tools/version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ripe/atlas/tools/version.py b/ripe/atlas/tools/version.py
index 46af323..e571f6c 100644
--- a/ripe/atlas/tools/version.py
+++ b/ripe/atlas/tools/version.py
@@ -13,4 +13,4 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-__version__ = "1.1.1"
+__version__ = "1.2.0"