Merge branch 'master' into job_manager

Author: jyu00

qiskit/advanced/ignis/5a_randomized_benchmarking.ipynb

@@ -98,9 +98,8 @@
     "\n",
     "This function returns:\n",
     "\n",
-    "- **rb_circs:** A list of lists of circuits for the RB sequences (separate list for each seed).\n",
-    "- **xdata:** The Clifford lengths (with multiplier if applicable).\n",
-    "- **rb_opts_dict:** Option dictionary back out with default options appended."
+    "- **rb_circs:** A list of lists of circuits for the rb sequences (separate list for each seed).\n",
+    "- **xdata:** The Clifford lengths (with multiplier if applicable)."
    ]
   },
   {

qiskit/advanced/ignis/5b_interleaved_rb.ipynb

@@ -109,7 +109,6 @@
     "\n",
     "- **rb_original_circs:** A list of lists of circuits for the original RB sequences (separate list for each seed).\n",
     "- **xdata:** The Clifford lengths (with multiplier if applicable).\n",
-    "- **rb_opts_dict:** Option dictionary back out with default options appended.\n",
     "\n",
     "As well as:\n",
     "- **rb_interleaved_circs**: A list of lists of circuits for the interleaved RB sequences (separate list for each seed)."

qiskit/advanced/ignis/5c_purity_rb.ipynb

@@ -105,7 +105,6 @@
     "\n",
     "- **rb_purity_circs**: A list of lists of lists of circuits for the purity RB sequences (separate list for each of the $3^n$ options and for each seed).\n",
     "- **xdata**: The Clifford lengths (with multiplier if applicable).\n",
-    "- **rb_opts_dict**: Option dictionary back out with default options appended.\n",
     "\n",
     "As well as:\n",
     "\n",