From 920a0b9f16d4d9f502da66f76873b2f77650f83c Mon Sep 17 00:00:00 2001
From: Michael Stack <stack@apache.org>
Date: Tue, 13 May 2014 20:04:46 +0000
Subject: [PATCH] HBASE-11123 Upgrade instructions from 0.94 to 0.98 (Misty
 Stanley-Jones)

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1594360 13f79535-47bb-0310-9956-ffa450edef68
---
 src/main/docbkx/upgrading.xml | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/main/docbkx/upgrading.xml b/src/main/docbkx/upgrading.xml
index ff603f9728f..22324a3491a 100644
--- a/src/main/docbkx/upgrading.xml
+++ b/src/main/docbkx/upgrading.xml
@@ -87,8 +87,20 @@
 
     <section xml:id="upgrade0.98">
       <title>Upgrading from 0.96.x to 0.98.x</title>
-      <para>A rolling upgrade from 0.96.x to 0.98.x works.  The two versions are not binary compatible.
-      TODO: List of changes.</para> 
+      <para>A rolling upgrade from 0.96.x to 0.98.x works. The two versions are not binary compatible.</para>
+          <para>Additional steps are required to take advantage of some of the new features of 0.98.x, including cell visibility
+          labels, cell ACLs, and transparent server side encryption. See the
+          <xref linkend="security" /> chapter of this guide for more information. Significant performance improvements include a change to the write
+          ahead log threading model that provides higher transaction throughput under
+          high load, reverse scanners, MapReduce over snapshot files, and striped
+          compaction.</para> 
+        <para>Clients and servers can run with 0.98.x and 0.96.x versions. However, applications may need to be recompiled due to changes in the Java API.</para>
+    </section>
+    <section>
+        <title>Upgrading from 0.94.x to 0.98.x</title>
+        <para>
+            A rolling upgrade from 0.94.x directly to 0.98.x does not work. The upgrade path follows the same procedures as <xref linkend="upgrade0.96" />. Additional steps are required to use some of the new features of 0.98.x. See <xref linkend="upgrade0.98" /> for an abbreviated list of these features.
+        </para>
     </section>
     <section xml:id="upgrade0.96">
       <title>Upgrading from 0.94.x to 0.96.x</title>