From 911a2060a4b111c9d49f78e05b9e987806a9afc1 Mon Sep 17 00:00:00 2001
From: Lauren Yu <6631887+laurenyu@users.noreply.github.com>
Date: Fri, 16 Nov 2018 10:57:57 -0800
Subject: [PATCH 1/3] remove local mode lock

---
 .gitignore                 | 1 +
 tests/data/local_mode_lock | 0
 2 files changed, 1 insertion(+)
 delete mode 100644 tests/data/local_mode_lock

diff --git a/.gitignore b/.gitignore
index 35800d01fb..863e0e9595 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,3 +25,4 @@ venv/
 *~
 .pytest_cache/
 *.swp
+tests/data/local_mode_lock
diff --git a/tests/data/local_mode_lock b/tests/data/local_mode_lock
deleted file mode 100644
index e69de29bb2..0000000000

From 4ca0446433302f8b7bdd786469e3b037db2f4209 Mon Sep 17 00:00:00 2001
From: Lauren Yu <6631887+laurenyu@users.noreply.github.com>
Date: Fri, 16 Nov 2018 10:58:49 -0800
Subject: [PATCH 2/3] bump version to 1.15.0

---
 CHANGELOG.rst             | 2 +-
 src/sagemaker/__init__.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 7f1f3f3aed..935c2507e8 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,7 +2,7 @@
 CHANGELOG
 =========
 
-1.14.3-dev
+1.15.0
 ======
 
 * bug-fix: Changes to use correct S3 bucket and time range for dataframes in TrainingJobAnalytics.
diff --git a/src/sagemaker/__init__.py b/src/sagemaker/__init__.py
index 785b3dd3b9..da2c848b54 100644
--- a/src/sagemaker/__init__.py
+++ b/src/sagemaker/__init__.py
@@ -37,4 +37,4 @@
 from sagemaker.session import s3_input  # noqa: F401
 from sagemaker.session import get_execution_role  # noqa: F401
 
-__version__ = '1.14.2'
+__version__ = '1.15.0'

From 7b97094f809993a76abb0504afc8d6fd2b62c102 Mon Sep 17 00:00:00 2001
From: Lauren Yu <6631887+laurenyu@users.noreply.github.com>
Date: Fri, 16 Nov 2018 13:26:50 -0800
Subject: [PATCH 3/3] update version

---
 doc/conf.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/conf.py b/doc/conf.py
index 3aaafe7ff0..0ca952e33a 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -32,7 +32,7 @@ def __getattr__(cls, name):
                 'numpy', 'scipy', 'scipy.sparse']
 sys.modules.update((mod_name, Mock()) for mod_name in MOCK_MODULES)
 
-version = '1.14.0'
+version = '1.15.0'
 project = u'sagemaker'
 
 # Add any Sphinx extension module names here, as strings. They can be extensions