From b89e984de5029c794e332a47c74b930f421d55c5 Mon Sep 17 00:00:00 2001
From: Matthew Treinish <mtreinish@kortar.org>
Date: Mon, 17 Jun 2019 12:17:52 -0400
Subject: [PATCH] Bump terra and prepare for release (#332)

* Bump terra and prepare for release

This commit bumps the terra version to pull in the latest release 0.8.1.
It also prepares the qiskit package versions for release.

* Update changelog
---
 CHANGELOG.md           | 11 ++++++++++-
 docs/conf.py           |  2 +-
 docs/release_notes.rst |  7 +++++++
 setup.py               |  4 ++--
 4 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 473bd6379ca1..176329e22bce 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,9 +14,18 @@ Changelog](http://keepachangelog.com/en/1.0.0/).
 > -   **Fixed**: for any bug fixes.
 > -   **Security**: in case of vulnerabilities.
 
-[UNRELEASED](https://github.com/Qiskit/qiskit-terra/compare/0.10.3...HEAD)
+[UNRELEASED](https://github.com/Qiskit/qiskit-terra/compare/0.10.4...HEAD)
 ==========================================================================
 
+[0.10.4](https://github.com/Qiskit/qiskit/compare/0.10.3...0.10.4) - 2019-06-17
+===============================================================================
+
+Changed
+-------
+
+- Increased the qiskit-terra version the latest release 0.8.2 (#332)
+
+
 [0.10.3](https://github.com/Qiskit/qiskit/compare/0.10.2...0.10.3) - 2019-05-29
 ===============================================================================
 
diff --git a/docs/conf.py b/docs/conf.py
index 28ded6b4329c..64a5db5f856c 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -38,7 +38,7 @@
 # The short X.Y version
 version = ''
 # The full version, including alpha/beta/rc tags
-release = '0.10.3'
+release = '0.10.4'
 
 
 # -- General configuration ---------------------------------------------------
diff --git a/docs/release_notes.rst b/docs/release_notes.rst
index 9268db7ee64d..6763f8fd723e 100644
--- a/docs/release_notes.rst
+++ b/docs/release_notes.rst
@@ -1212,6 +1212,13 @@ This table tracks the meta-package versions and the version of each Qiskit eleme
      - qiskit-ibmq-provider
      - qiskit-aqua
      - qiskit-chemistry
+   * - 0.10.4
+     - 0.8.2
+     - 0.2.1
+     - 0.1.1
+     - 0.2.2
+     - 0.5.1
+     - 0.5.0
    * - 0.10.3
      - 0.8.1
      - 0.2.1
diff --git a/setup.py b/setup.py
index fbbc5b9b3f38..244704536e92 100755
--- a/setup.py
+++ b/setup.py
@@ -19,7 +19,7 @@
 from setuptools.command.install import install
 from setuptools.command.develop import develop
 
-qiskit_terra = "qiskit_terra==0.8.1"
+qiskit_terra = "qiskit_terra==0.8.2"
 
 requirements = [
     qiskit_terra,
@@ -77,7 +77,7 @@ def run(self):
 
 setup(
     name="qiskit",
-    version="0.10.3",
+    version="0.10.4",
     description="Software for developing quantum computing programs",
     long_description="Qiskit is a software development kit for writing "
                      "quantum computing experiments, programs, and "