From edfd5f1504635da6a170fb145836f8678623a7ba Mon Sep 17 00:00:00 2001
From: Nathan Acuff <nathan@expectedbehavior.com>
Date: Wed, 22 Mar 2017 11:06:40 -0400
Subject: [PATCH] release v1.2.0

---
 CHANGELOG.md                | 3 +++
 instrumental_agent/agent.py | 2 +-
 setup.py                    | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1c0781e..350762f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+### 1.2.0 [March 22, 2016]
+* Make logging configurable and silence it by default [[#14](https://github.com/Instrumental/instrumental_agent-python/pull/14)]
+
 ### 1.1.0 [August 8, 2016]
 * **BUGFIX**: Preserve timezone information when sending a time with a metric [[#11](https://github.com/Instrumental/instrumental_agent-python/pull/11)]
 * make handshake version string match pattern of other 1st-party agents [[#12](https://github.com/Instrumental/instrumental_agent-python/pull/12)]
diff --git a/instrumental_agent/agent.py b/instrumental_agent/agent.py
index 884e7e8..12233c4 100644
--- a/instrumental_agent/agent.py
+++ b/instrumental_agent/agent.py
@@ -90,7 +90,7 @@ class Agent(object):
     max_buffer = 5000
     max_reconnect_delay = 15
     exit_timeout = 1
-    version = "1.1.0"
+    version = "1.2.0"
 
     def __init__(self, api_key, collector="collector.instrumentalapp.com:8001", enabled=True, secure=True, verify_cert=True, synchronous=False):
         self.logger = logging.getLogger(__name__)
diff --git a/setup.py b/setup.py
index 26a8429..012912f 100644
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,7 @@
 from setuptools import setup, find_packages
 
 NAME = "instrumental_agent"
-VERSION = "1.1.0"
+VERSION = "1.2.0"
 
 
 # To install the library, run the following