Merge "Mitaka time"

doc/glossary/glossary-terms.xml

@@ -5491,6 +5491,20 @@
         </para>
       </glossdef>
     </glossentry>
+
+    <glossentry>
+      <glossterm>Mitaka</glossterm>
+      <indexterm class="singular">
+          <primary>Mitaka</primary>
+        </indexterm>
+
+      <glossdef>
+        <para>The code name for the thirteenth release of OpenStack.
+        The design summit will take place in Tokyo, Japan. Mitaka
+        is a city in Tokyo.</para>
+      </glossdef>
+    </glossentry>
+
     <glossentry>
       <glossterm>multi-host</glossterm>
       <indexterm class="singular">
@@ -6291,7 +6305,8 @@
         <para>
           Each OpenStack release has a code name. Code names ascend in
           alphabetical order: Austin, Bexar, Cactus, Diablo, Essex,
-          Folsom, Grizzly, Havana, Icehouse, Juno, Kilo, and Liberty.
+          Folsom, Grizzly, Havana, Icehouse, Juno, Kilo, Liberty,
+          and Mitaka.
           Code names are cities or counties near where the
           corresponding OpenStack design summit took place. An
           exception, called the Waldon exception, is granted to