From 97b38fbdb4fb3032de8e385a5b4f3cf4d896027a Mon Sep 17 00:00:00 2001
From: stack <stack@apache.org>
Date: Fri, 14 Nov 2014 10:36:24 -0800
Subject: [PATCH] Add wandisco meetup to front page and add pointer to elliotts
 metrics writeup under metrics doc

---
 src/main/docbkx/ops_mgt.xml  | 5 ++++-
 src/main/site/xdoc/index.xml | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/docbkx/ops_mgt.xml b/src/main/docbkx/ops_mgt.xml
index c1b1bd8e347..b52457abe4c 100644
--- a/src/main/docbkx/ops_mgt.xml
+++ b/src/main/docbkx/ops_mgt.xml
@@ -982,7 +982,10 @@ $ for i in `cat conf/regionservers|sort`; do ./bin/graceful_stop.sh --restart --
     <title>HBase Metrics</title>
     <para>HBase emits metrics which adhere to the <link
         xlink:href="http://hadoop.apache.org/core/docs/current/api/org/apache/hadoop/metrics/package-summary.html"
-        >Hadoop metrics</link> API. Starting with HBase 0.95, HBase is configured to emit a default
+        >Hadoop metrics</link> API. Starting with HBase 0.95<footnote><para>The Metrics system was redone in
+          HBase 0.96. See <link xlink:href="https://blogs.apache.org/hbase/entry/migration_to_the_new_metrics">Migration
+            to the New Metrics Hotness – Metrics2</link> by Elliot Clark for detail</para></footnote>,
+      HBase is configured to emit a default
       set of metrics with a default sampling period of every 10 seconds. You can use HBase
       metrics in conjunction with Ganglia. You can also filter which metrics are emitted and extend
       the metrics framework to capture custom metrics appropriate for your environment.</para>
diff --git a/src/main/site/xdoc/index.xml b/src/main/site/xdoc/index.xml
index 9e45501ba28..1e6d8e9f851 100644
--- a/src/main/site/xdoc/index.xml
+++ b/src/main/site/xdoc/index.xml
@@ -68,6 +68,7 @@ Apache HBase is an open-source, distributed, versioned, non-relational database
    </p>
  </section>
      <section name="News">
+       <p>November 20th, 2014 <a href="http://www.meetup.com/hbaseusergroup/events/205219992/">HBase meetup @ WANdisco</a> in San Ramon</p>
        <p>October 27th, 2014 <a href="http://www.meetup.com/hbaseusergroup/events/207386102/">HBase Meetup @ Apple</a> in Cupertino</p>
        <p>October 15th, 2014 <a href="http://www.meetup.com/HBase-NYC/events/207655552">HBase Meetup @ Google</a> on the night before Strata/HW in NYC</p>
        <p>September 25th, 2014 <a href="http://www.meetup.com/hbaseusergroup/events/203173692/">HBase Meetup @ Continuuity</a> in Palo Alto</p>