Author: buildbot
Date: Wed Mar 25 17:59:38 2015
New Revision: 945041

Log:
Staging update by buildbot for slider

Added:
    websites/staging/slider/trunk/content/developing/chaosmonkey.html
    websites/staging/slider/trunk/content/docs/configuration/appconfig.html.html
    websites/staging/slider/trunk/content/docs/configuration/internal.html
    
websites/staging/slider/trunk/content/docs/configuration/resource_specification.html
    websites/staging/slider/trunk/content/docs/configuration/revision-1/
    
websites/staging/slider/trunk/content/docs/configuration/revision-1/index.html
    
websites/staging/slider/trunk/content/docs/configuration/revision-1/original-hbase.json
    
websites/staging/slider/trunk/content/docs/configuration/revision-1/proposed-hbase.json
    
websites/staging/slider/trunk/content/docs/configuration/revision-1/redesign.html
    
websites/staging/slider/trunk/content/docs/configuration/revision-1/specification.html
Removed:
    websites/staging/slider/trunk/content/docs/configuration/original-hbase.json
    websites/staging/slider/trunk/content/docs/configuration/proposed-hbase.json
    websites/staging/slider/trunk/content/docs/configuration/redesign.html
    websites/staging/slider/trunk/content/docs/configuration/specification.html
    websites/staging/slider/trunk/content/docs/slider_specs/chaosmonkey.html
    
websites/staging/slider/trunk/content/docs/slider_specs/resource_specification.html
Modified:
    websites/staging/slider/trunk/content/   (props changed)
    websites/staging/slider/trunk/content/design/rolehistory.html
    websites/staging/slider/trunk/content/developing/index.html
    websites/staging/slider/trunk/content/docs/client-configuration.html
    websites/staging/slider/trunk/content/docs/configuration/core.html
    websites/staging/slider/trunk/content/docs/configuration/index.html
    websites/staging/slider/trunk/content/docs/examples.html
    websites/staging/slider/trunk/content/docs/getting_started.html
    websites/staging/slider/trunk/content/docs/high_availability.html
    websites/staging/slider/trunk/content/docs/security.html
    
websites/staging/slider/trunk/content/docs/slider_specs/application_instance_configuration.html
    
websites/staging/slider/trunk/content/docs/slider_specs/creating_app_definitions.html
    
websites/staging/slider/trunk/content/docs/slider_specs/hello_world_slider_app.html
    websites/staging/slider/trunk/content/docs/slider_specs/index.html
    
websites/staging/slider/trunk/content/docs/slider_specs/specifying_exports.html
    websites/staging/slider/trunk/content/docs/ssl.html

Propchange: websites/staging/slider/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Wed Mar 25 17:59:38 2015
@@ -1 +1 @@
-1667824
+1669188

Modified: websites/staging/slider/trunk/content/design/rolehistory.html
==============================================================================
--- websites/staging/slider/trunk/content/design/rolehistory.html (original)
+++ websites/staging/slider/trunk/content/design/rolehistory.html Wed Mar 25 
17:59:38 2015
@@ -190,16 +190,18 @@ that have reached their escalation timeo
 <li>Such requests are cancelled and "relaxed" requests re-issued.</li>
 <li>Labels are always respected; even relaxed requests use any labels 
specified in <code>resources.json</code></li>
 <li>If a node is considered unreliable (as per-the slider 0.70 changes), it is 
not used in the initial
-request. </li>
+request. YARN may still allocate relaxed instances on such nodes. That is: 
there is no explicit
+blacklisting, merely deliberate exclusion of unreliable nodes from explicitly 
placed requests.</li>
 </ol>
-<h4 id="strict-placement"><code>strict</code> placement</h4>
+<h4 id="placement-policies">Placement policies</h4>
+<p><code>strict</code> placement</p>
 <p>Again, "strict placement" has a different policy: once a component has been 
deployed on a node,
 one component request will be made against that node, even if it is considered 
unreliable. No
 relaxation of the request will ever take place.</p>
-<h4 id="none-placement"><code>none</code> placement</h4>
+<p><code>none</code> placement</p>
 <p>If the placement policy is "none", the request will always be relaxed.
 While tracking of recent failure counts takes place, it is not used in 
placement requests.</p>
-<h4 id="anti-affine-placement"><code>anti-affine</code> placement</h4>
+<p><code>anti-affine</code> placement</p>
 <p>There's still no explicit support for this in YARN or slider. As noted 
above, Slider does
 try to spread placement when rebuilding an application, but otherwise it 
accepts which
 hosts YARN allocates containers on.</p>

Added: websites/staging/slider/trunk/content/developing/chaosmonkey.html
==============================================================================
--- websites/staging/slider/trunk/content/developing/chaosmonkey.html (added)
+++ websites/staging/slider/trunk/content/developing/chaosmonkey.html Wed Mar 
25 17:59:38 2015
@@ -0,0 +1,341 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <link href="/css/bootstrap.min.css" rel="stylesheet">
+  <link href="/css/bootstrap-theme.min.css" rel="stylesheet">
+  <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+  <!--[if lt IE 9]>
+    <script 
src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js";></script>
+    <script 
src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js";></script>
+  <![endif]-->
+  <script 
src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js";></script>
+  <script src="/js/bootstrap.min.js"></script>
+  <link href="/css/slider.css" rel="stylesheet" type="text/css">
+  <link 
href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css" 
rel="stylesheet">
+  <title></title>
+  
+</head>
+
+<body>
+<nav class="navbar navbar-default navbar-fixed-top" role="navigation">
+<div class="container-fluid">
+  <div class="navbar-header">
+    <button type="button" class="navbar-toggle" data-toggle="collapse" 
data-target="#navbar-items">
+      <span class="sr-only">Toggle navigation</span>
+      <span class="icon-bar"></span>
+      <span class="icon-bar"></span>
+      <span class="icon-bar"></span>
+    </button>
+    <a class="navbar-brand" href="/index.html">Slider</a>
+  </div>
+  <div class="collapse navbar-collapse" id="navbar-items">
+  <ul class="nav navbar-nav">
+    <li class="dropdown">
+      <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+        Project <span class="caret"></span>
+      </a>
+<ul class="dropdown-menu">
+<li id="nav_index"><a href="/index.html">Home</a></li>
+<li id="nav_downloads"><a href="/downloads">Downloads</a></li>
+<li id="nav_source"><a 
href="https://git-wip-us.apache.org/repos/asf/incubator-slider.git";><i 
class="fa fa-external-link"></i> Source</a></li>
+<li><a href="http://www.apache.org/licenses/LICENSE-2.0";><i class="fa 
fa-external-link"></i> License</a></li>
+<li class="divider"></li>
+<li class="dropdown-header">Community</li>
+<li id="nav_team"><a href="/team.html">Team</a></li>
+<li id="nav_mailinglists"><a href="/mailing_lists.html">Mailing Lists</a></li>
+<li class="divider"></li>
+<li class="dropdown-header">Tools</li>
+<li id="nav_jira"><a href="https://issues.apache.org/jira/browse/SLIDER";><i 
class="fa fa-external-link"></i> Issues</a></li>
+<li id="nav_builds"><a href="https://builds.apache.org/job/Slider-develop";><i 
class="fa fa-external-link"></i> Builds</a></li>
+</ul>
+</li>
+
+    <li class="dropdown">
+      <a class="dropdown-toggle" data-toggle="dropdown" href="/design">
+        Design <span class="caret"></span>
+      </a>
+<ul class="dropdown-menu">
+<li id="nav_design_overview"><a 
href="/design/architecture.html">Overview</a></li>
+<li id="nav_app_needs"><a 
href="/docs/slider_specs/application_needs.html">Application Needs</a></li>
+<li id="nav_spec"><a href="/design/specification/index.html">Expected 
Behavior</a></li>
+<li id="nav_registry"><a href="/design/registry/index.html">Service 
Registry</a></li>
+<li id="nav_ssl_impl"><a href="/design/ssl_implementation.html">SSL 
Implementation</a></li>
+<li id="nav_role_history"><a href="/design/rolehistory.html">Role 
History</a></li>
+</ul>
+</li>
+
+
+    <li class="dropdown">
+      <a class="dropdown-toggle" data-toggle="dropdown" href="/developing">
+        Developing <span class="caret"></span>
+      </a>
+<ul class="dropdown-menu">
+<li id="nav_dev_building"><a href="/developing/building.html">Building</a></li>
+<li id="nav_dev_debugging"><a 
href="/developing/debugging.html">Debugging</a></li>
+<li id="nav_dev_testing"><a href="/developing/testing.html">Testing</a></li>
+<li id="nav_dev_funtesting"><a 
href="/developing/functional_tests.html">Functional Testing</a></li>
+<li id="nav_dev_manual_testing"><a 
href="/developing/manual_testing.html">Manual Testing</a></li>
+<li id="nav_releasing"><a href="/developing/releasing.html">Releasing</a></li>
+</ul>
+</li>
+
+    <li class="dropdown">
+      <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+        Using <span class="caret"></span>
+      </a>
+<ul class="dropdown-menu">
+<li id="nav_use_getting_started"><a href="/docs/getting_started.html">Getting 
Started</a></li>
+<li id="nav_use_manpage"><a href="/docs/manpage.html">Man Page</a></li>
+<li role="presentation" class="divider"></li>
+<li id="nav_use_app_package"><a href="/docs/slider_specs/index.html">Creating 
App Packages</a></li>
+<li role="presentation" class="divider"></li>
+<li id="nav_use_client_config"><a 
href="/docs/client-configuration.html">Client Configuration</a></li>
+<li id="nav_use_exitcodes"><a href="/docs/exitcodes.html">Client Exit 
Codes</a></li>
+<li role="presentation" class="divider"></li>
+<li id="nav_use_debugging"><a 
href="/developing/debugging.html">Debugging</a></li>
+<li id="nav_use_troubleshooting"><a 
href="/docs/troubleshooting.html">Troubleshooting</a></li>
+<li role="presentation" class="divider"></li>
+<li id="nav_use_high_availability"><a href="/docs/high_availability.html">High 
Availability</a></li>
+<li id="nav_use_security"><a href="/docs/security.html">Security</a></li>
+<li id="nav_am_agent_ssl"><a href="/docs/ssl.html">Agent to AM SSL</a></li>
+<li id="nav_use_app_configuration"><a 
href="/docs/configuration/index.html">App Configuration Model</a></li>
+<li id="nav_use_examples"><a href="/docs/examples.html">Provider 
Examples</a></li>
+</ul>
+</li>
+
+    <li class="dropdown">
+      <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+        ASF Links <span class="caret"></span>
+      </a>
+<ul class="dropdown-menu">
+<li><a href="http://www.apache.org";><i class="fa fa-external-link"></i> Apache 
Software Foundation</a></li>
+<li><a href="http://www.apache.org/foundation/sponsorship.html";><i class="fa 
fa-external-link"></i> Sponsorship</a></li>
+<li><a href="http://www.apache.org/security/";><i class="fa 
fa-external-link"></i> Security</a></li>
+<li><a href="http://www.apache.org/foundation/thanks.html";><i class="fa 
fa-external-link"></i> Thanks</a></li>
+</ul>
+</li>
+</ul>
+
+  </div>
+
+</div>
+</nav>
+
+
+<div class="container-fluid">
+<div class="row">
+  <div class="col-md-2" id="sidebar">
+  <div style="text-align: center">
+    <h1><a href="/index.html">Apache Slider (incubating)</a></h1>
+    <hr>
+Latest release: <strong>0.60.0-incubating</strong><br>
+    <br>
+    <a id="download-button-sidebar" class="btn btn-success btn-block" 
href="/downloads/" role="button">Download</a>
+  </div>
+    <hr>
+    <a href="http://incubator.apache.org";><img id="logo" alt="Apache Incubator 
&trade;" class="img-responsive" 
src="http://incubator.apache.org/images/apache-incubator-logo.png"/></a>
+  </div>
+  <div class="col-md-8 col-md-offset-1">
+
+  <div id="content">
+
+    <h1 class="title"></h1>
+
+    <!---
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License. See accompanying LICENSE file.
+-->
+
+<h1 id="slider-chaos-monkey">Slider Chaos Monkey</h1>
+<p>Slider includes a built in <a 
href="http://techblog.netflix.com/2012/07/chaos-monkey-released-into-wild.html";>Chaos
 Monkey</a>.
+This is a service which runs inside the Slider Application Master, and randomly
+kills containers without any warning, or even the application master 
itself.</p>
+<p>This Chaos Monkey is intended for testing. Netflix's original design runs
+against all their production applications hosted in Amazon's cloud. The slider
+Chaos Monkey also may be used in production, if desired, though it is not 
something
+we would recommend, especially for any application where the cost of
+reacting to or recovering from failures is tangible. </p>
+<p>If used in production, note that YARN needs to be configured
+to tolerate the failure rate, and the Slider failure threshold 
(<code>yarn.container.failure.threshold</code>)
+and window are configured to tolerate the increased failure rate.</p>
+<p>The Chaos Monkey works as follows</p>
+<ol>
+<li>The monkey wakes up at a configured interval "comes out to play".</li>
+<li>For each chaos action, the monkey then generates a random number</li>
+<li>If the probability of the chaos action is greater than this random number,
+the action is performed.</li>
+</ol>
+<p>As an example, if the probability of killing the AM is set to 50%, and the
+monkey interval is set to one hour, then one would expect over a 48 hour period
+for the AM to have failed approximately 24 times. As the check is random, it 
is unlikey
+to be exactly this value, nor will the interval between failures be exactly 
two hours.</p>
+<p>A monkey interval of 30 minutes and an AM kill probability of 25% would 
result
+in the aggregate failure rate being approximately the same, but the interval 
between failures
+would be different.</p>
+<h2 id="configuring-the-chaos-monkey">Configuring the Chaos Monkey</h2>
+<p>The Chaos Monkey is configured on a per-application basis, by setting 
options
+in the <code>global</code> section of the internal resources file, 
<code>internal.json</code></p>
+<p>Any option which takes a probability uses unit of hundreths of a percentage,
+that is <code>10000</code> units are equivalent to a probability of 
<code>1</code>: a operation will always
+take place. A value of <code>100</code> is translated to 1%, a probability of 
0.01. </p>
+<p>This unit is used to allow very small percentages to be expressed without 
resorting
+to floating point numbers.</p>
+<p>the monkey can be enabled, after which the interval between checks must be 
set.
+Available actions can then have their individidual probability set.</p>
+<h3 id="enabling-the-monkey">Enabling the Monkey</h3>
+<p>The option <code>internal.chaos.monkey.enabled</code> enables or disables 
the monkey; it
+must equal <code>"true"</code> for the monkey to be enabled and other options 
read.</p>
+<h3 id="interval">Interval</h3>
+<p>The interval (aggregated to produce a total interval) between checks to see 
if
+<em>any</em> chaos action is to be triggered.</p>
+<ul>
+<li><code>internal.chaos.monkey.interval.days</code></li>
+<li><code>internal.chaos.monkey.interval.hours</code></li>
+<li><code>internal.chaos.monkey.interval.minutes</code></li>
+<li><code>internal.chaos.monkey.interval.seconds</code></li>
+</ul>
+<p>If not interval is set the chaos monkey does not start</p>
+<h3 id="startup-delay">Startup delay</h3>
+<p>The chaos monkey can be given a startup delay before it begins
+actions. The value defaults to the interval value (see above).</p>
+<ul>
+<li><code>internal.chaos.monkey.delay.days</code></li>
+<li><code>internal.chaos.monkey.delay.hours</code></li>
+<li><code>internal.chaos.monkey.delay.minutes</code></li>
+<li><code>internal.chaos.monkey.delay.seconds</code></li>
+</ul>
+<h2 id="application-master-kill">Application Master Kill</h2>
+<p>The probability of the AM being killed on a monkey check is:</p>
+<div class="codehilite"><pre><span class="n">internal</span><span 
class="p">.</span><span class="n">chaos</span><span class="p">.</span><span 
class="n">monkey</span><span class="p">.</span><span 
class="n">probability</span><span class="p">.</span><span 
class="n">amfailure</span>
+</pre></div>
+
+
+<p>When the monkey triggers this action, the AM kills itself. YARN is expected 
to
+detect this and react by creating a new application master —while leaving the
+running application itself to continue uninterrupted.</p>
+<p>For the AM to recover from failures, YARN must be configured to support 
application
+retries.</p>
+<p>As a restarted AM resets all its internal state, the Chaos Monkey itself 
will be
+restarted with a new interval <em>which begins from the moment the AM is 
restarted</em>.</p>
+<h2 id="container-kill">Container Kill</h2>
+<p>The probability of a container being killed in a single monkey "play" 
is:</p>
+<div class="codehilite"><pre><span class="n">internal</span><span 
class="p">.</span><span class="n">chaos</span><span class="p">.</span><span 
class="n">monkey</span><span class="p">.</span><span 
class="n">probability</span><span class="p">.</span><span 
class="n">containerfailure</span>
+</pre></div>
+
+
+<p>When the monkey triggers this action, the current list of active YARN 
containers
+being used by the application is enumerated, then one of the containers is 
selected
+at random to be killed.</p>
+<p>The Slider Application Master is expected to notice this event and respond 
by
+requesting and re-instantiating a replacement failure.</p>
+<p>The Slider Application should be configured in its 
<code>resources.json</code> file to
+tolerate a failure rate.</p>
+<p>If there are no containers hosting application components at the time
+the chaos monkey performs its actions, then no container will be killed.</p>
+<h2 id="am-launch-failure">AM Launch Failure</h2>
+<p>The launch failure is a special check at startup, if the monkey is enabled:
+it defines the probability that the launch itself will fail.</p>
+<p>It is tested precisely once per application attempt, at launch startup</p>
+<div class="codehilite"><pre><span class="n">internal</span><span 
class="p">.</span><span class="n">chaos</span><span class="p">.</span><span 
class="n">monkey</span><span class="p">.</span><span 
class="n">probability</span><span class="p">.</span><span 
class="n">amlaunchfailure</span>
+</pre></div>
+
+
+<p>Note that the chaos monkey must be enabled for this check, where that means
+1. the monkey must be enabled with 
<code>internal.chaos.monkey.enabled=true</code>
+1. A non-zero monkey interval must be set via the 
<code>internal.chaos.monkey.interval</code>
+properties</p>
+<h1 id="example">Example</h1>
+<p>A disabled Chaos Monkey</p>
+<div class="codehilite"><pre><span class="p">{</span>
+  &quot;<span class="n">internal</span><span class="p">.</span><span 
class="n">chaos</span><span class="p">.</span><span 
class="n">monkey</span><span class="p">.</span><span 
class="n">enabled</span>&quot;<span class="p">:</span>&quot; <span 
class="n">false</span>&quot;
+<span class="p">}</span>
+</pre></div>
+
+
+<p>As this is the default, it does not need to be declared.</p>
+<div class="codehilite"><pre><span class="p">{</span>
+  &quot;<span class="n">internal</span><span class="p">.</span><span 
class="n">chaos</span><span class="p">.</span><span 
class="n">monkey</span><span class="p">.</span><span 
class="n">enabled</span>&quot;<span class="p">:</span> &quot;<span 
class="n">true</span>&quot;<span class="p">,</span>
+  &quot;<span class="n">internal</span><span class="p">.</span><span 
class="n">chaos</span><span class="p">.</span><span 
class="n">monkey</span><span class="p">.</span><span 
class="n">interval</span><span class="p">.</span><span 
class="n">hours</span>&quot;<span class="p">:</span> &quot;1&quot;<span 
class="p">,</span>
+  &quot;<span class="n">internal</span><span class="p">.</span><span 
class="n">chaos</span><span class="p">.</span><span 
class="n">monkey</span><span class="p">.</span><span 
class="n">interval</span><span class="p">.</span><span 
class="n">minutes</span>&quot;<span class="p">:</span> &quot;30&quot;<span 
class="p">,</span>
+  &quot;<span class="n">internal</span><span class="p">.</span><span 
class="n">chaos</span><span class="p">.</span><span 
class="n">monkey</span><span class="p">.</span><span 
class="n">probability</span><span class="p">.</span><span 
class="n">containerfailure</span>&quot;<span class="p">:</span> 
&quot;1000&quot;<span class="p">,</span>
+  &quot;<span class="n">internal</span><span class="p">.</span><span 
class="n">chaos</span><span class="p">.</span><span 
class="n">monkey</span><span class="p">.</span><span 
class="n">probability</span><span class="p">.</span><span 
class="n">amfailure</span>&quot;<span class="p">:</span> &quot;5&quot;
+<span class="p">}</span>
+</pre></div>
+
+
+<p>This configuration</p>
+<ol>
+<li>Enables the Chaos Monkey</li>
+<li>Set the interval to 1h 30m; 90 minutes.</li>
+<li>Sets the probability of a container failure to 10%</li>
+<li>Sets the probability of an application master failure to 0.05%</li>
+</ol>
+<p>With these values, over an 24 hour period, the probability of a container
+being killed is <code>16 * 1000 / 10000</code>: <code>1.6</code>, </p>
+<p>That is, at least one container is likely to have been killed over the 
day.</p>
+<p>The probability of the AM failing is significantly lower</p>
+<div class="codehilite"><pre>16 <span class="o">*</span> 0<span 
class="p">.</span>0005 <span class="p">=</span> 0<span class="p">.</span>008 
<span class="p">=</span> 0<span class="p">.</span>8<span class="c">%</span>
+</pre></div>
+
+
+<p>If any probability is set to zero, such as: </p>
+<div class="codehilite"><pre>&quot;<span class="n">internal</span><span 
class="p">.</span><span class="n">chaos</span><span class="p">.</span><span 
class="n">monkey</span><span class="p">.</span><span 
class="n">probability</span><span class="p">.</span><span 
class="n">amfailure</span>&quot;<span class="p">:</span> &quot;0&quot;
+</pre></div>
+
+
+<p>Then that check is never made —here the AM will never be killed by
+the Chaos Monkey.</p>
+  </div>
+
+  <div id="footer">
+    <a alt="Apache Software Foundation" href="http://www.apache.org";>
+      <img id="asf-logo" alt="Apache Software Foundation" 
src="/images/feather-small.gif" width="100">
+    </a>
+    <div class="copyright">
+      <p>
+        Copyright &copy; 2011-2014 The Apache Software Foundation, Licensed 
under
+        the <a href="http://www.apache.org/licenses/LICENSE-2.0";>Apache 
License, Version 2.0</a>.
+        Apache Slider, Slider, Apache, the Apache feather logo, and the Apache 
Incubator
+        project logo are trademarks of the <a 
href="http://www.apache.org";>Apache Software Foundation</a>.<br />
+        Site created with <a href="http://getbootstrap.com/";>Bootstrap</a> 
including icons from <a href="http://glyphicons.com/";>GLYPHICONS</a> and <a 
href="http://fontawesome.io/";>Font Awesome</a>.
+      </p>
+    </div> 
+  </div>
+  </div>
+
+</div>
+</div>
+
+<script type="text/javascript">
+
+</script>
+</body>
+</html>

Modified: websites/staging/slider/trunk/content/developing/index.html
==============================================================================
--- websites/staging/slider/trunk/content/developing/index.html (original)
+++ websites/staging/slider/trunk/content/developing/index.html Wed Mar 25 
17:59:38 2015
@@ -193,6 +193,7 @@ Slider</p>
 <li><a href="submitting_patches.html">Submitting Patches</a></li>
 <li><a href="windows.html">Windows Development and Testing</a></li>
 <li><a href="demo.html">Demo Script</a></li>
+<li><a href="chaosmonkey.html">Configuring the Slider Chaos Monkey</a></li>
 </ul>
 <h2 id="historical-documents">Historical Documents</h2>
 <p>These documents are obsolete; they are retained for reference.</p>

Modified: websites/staging/slider/trunk/content/docs/client-configuration.html
==============================================================================
--- websites/staging/slider/trunk/content/docs/client-configuration.html 
(original)
+++ websites/staging/slider/trunk/content/docs/client-configuration.html Wed 
Mar 25 17:59:38 2015
@@ -437,7 +437,7 @@ and, </p>
 and the HDFS Kerberos principal.</p>
 </li>
 <li>
-<p>The yarn registry options. </p>
+<p>The YARN registry options. </p>
 </li>
 </ol>
   </div>

Added: 
websites/staging/slider/trunk/content/docs/configuration/appconfig.html.html
==============================================================================
--- 
websites/staging/slider/trunk/content/docs/configuration/appconfig.html.html 
(added)
+++ 
websites/staging/slider/trunk/content/docs/configuration/appconfig.html.html 
Wed Mar 25 17:59:38 2015
@@ -0,0 +1,203 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <link href="/css/bootstrap.min.css" rel="stylesheet">
+  <link href="/css/bootstrap-theme.min.css" rel="stylesheet">
+  <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+  <!--[if lt IE 9]>
+    <script 
src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js";></script>
+    <script 
src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js";></script>
+  <![endif]-->
+  <script 
src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js";></script>
+  <script src="/js/bootstrap.min.js"></script>
+  <link href="/css/slider.css" rel="stylesheet" type="text/css">
+  <link 
href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css" 
rel="stylesheet">
+  <title></title>
+  
+</head>
+
+<body>
+<nav class="navbar navbar-default navbar-fixed-top" role="navigation">
+<div class="container-fluid">
+  <div class="navbar-header">
+    <button type="button" class="navbar-toggle" data-toggle="collapse" 
data-target="#navbar-items">
+      <span class="sr-only">Toggle navigation</span>
+      <span class="icon-bar"></span>
+      <span class="icon-bar"></span>
+      <span class="icon-bar"></span>
+    </button>
+    <a class="navbar-brand" href="/index.html">Slider</a>
+  </div>
+  <div class="collapse navbar-collapse" id="navbar-items">
+  <ul class="nav navbar-nav">
+    <li class="dropdown">
+      <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+        Project <span class="caret"></span>
+      </a>
+<ul class="dropdown-menu">
+<li id="nav_index"><a href="/index.html">Home</a></li>
+<li id="nav_downloads"><a href="/downloads">Downloads</a></li>
+<li id="nav_source"><a 
href="https://git-wip-us.apache.org/repos/asf/incubator-slider.git";><i 
class="fa fa-external-link"></i> Source</a></li>
+<li><a href="http://www.apache.org/licenses/LICENSE-2.0";><i class="fa 
fa-external-link"></i> License</a></li>
+<li class="divider"></li>
+<li class="dropdown-header">Community</li>
+<li id="nav_team"><a href="/team.html">Team</a></li>
+<li id="nav_mailinglists"><a href="/mailing_lists.html">Mailing Lists</a></li>
+<li class="divider"></li>
+<li class="dropdown-header">Tools</li>
+<li id="nav_jira"><a href="https://issues.apache.org/jira/browse/SLIDER";><i 
class="fa fa-external-link"></i> Issues</a></li>
+<li id="nav_builds"><a href="https://builds.apache.org/job/Slider-develop";><i 
class="fa fa-external-link"></i> Builds</a></li>
+</ul>
+</li>
+
+    <li class="dropdown">
+      <a class="dropdown-toggle" data-toggle="dropdown" href="/design">
+        Design <span class="caret"></span>
+      </a>
+<ul class="dropdown-menu">
+<li id="nav_design_overview"><a 
href="/design/architecture.html">Overview</a></li>
+<li id="nav_app_needs"><a 
href="/docs/slider_specs/application_needs.html">Application Needs</a></li>
+<li id="nav_spec"><a href="/design/specification/index.html">Expected 
Behavior</a></li>
+<li id="nav_registry"><a href="/design/registry/index.html">Service 
Registry</a></li>
+<li id="nav_ssl_impl"><a href="/design/ssl_implementation.html">SSL 
Implementation</a></li>
+<li id="nav_role_history"><a href="/design/rolehistory.html">Role 
History</a></li>
+</ul>
+</li>
+
+
+    <li class="dropdown">
+      <a class="dropdown-toggle" data-toggle="dropdown" href="/developing">
+        Developing <span class="caret"></span>
+      </a>
+<ul class="dropdown-menu">
+<li id="nav_dev_building"><a href="/developing/building.html">Building</a></li>
+<li id="nav_dev_debugging"><a 
href="/developing/debugging.html">Debugging</a></li>
+<li id="nav_dev_testing"><a href="/developing/testing.html">Testing</a></li>
+<li id="nav_dev_funtesting"><a 
href="/developing/functional_tests.html">Functional Testing</a></li>
+<li id="nav_dev_manual_testing"><a 
href="/developing/manual_testing.html">Manual Testing</a></li>
+<li id="nav_releasing"><a href="/developing/releasing.html">Releasing</a></li>
+</ul>
+</li>
+
+    <li class="dropdown">
+      <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+        Using <span class="caret"></span>
+      </a>
+<ul class="dropdown-menu">
+<li id="nav_use_getting_started"><a href="/docs/getting_started.html">Getting 
Started</a></li>
+<li id="nav_use_manpage"><a href="/docs/manpage.html">Man Page</a></li>
+<li role="presentation" class="divider"></li>
+<li id="nav_use_app_package"><a href="/docs/slider_specs/index.html">Creating 
App Packages</a></li>
+<li role="presentation" class="divider"></li>
+<li id="nav_use_client_config"><a 
href="/docs/client-configuration.html">Client Configuration</a></li>
+<li id="nav_use_exitcodes"><a href="/docs/exitcodes.html">Client Exit 
Codes</a></li>
+<li role="presentation" class="divider"></li>
+<li id="nav_use_debugging"><a 
href="/developing/debugging.html">Debugging</a></li>
+<li id="nav_use_troubleshooting"><a 
href="/docs/troubleshooting.html">Troubleshooting</a></li>
+<li role="presentation" class="divider"></li>
+<li id="nav_use_high_availability"><a href="/docs/high_availability.html">High 
Availability</a></li>
+<li id="nav_use_security"><a href="/docs/security.html">Security</a></li>
+<li id="nav_am_agent_ssl"><a href="/docs/ssl.html">Agent to AM SSL</a></li>
+<li id="nav_use_app_configuration"><a 
href="/docs/configuration/index.html">App Configuration Model</a></li>
+<li id="nav_use_examples"><a href="/docs/examples.html">Provider 
Examples</a></li>
+</ul>
+</li>
+
+    <li class="dropdown">
+      <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+        ASF Links <span class="caret"></span>
+      </a>
+<ul class="dropdown-menu">
+<li><a href="http://www.apache.org";><i class="fa fa-external-link"></i> Apache 
Software Foundation</a></li>
+<li><a href="http://www.apache.org/foundation/sponsorship.html";><i class="fa 
fa-external-link"></i> Sponsorship</a></li>
+<li><a href="http://www.apache.org/security/";><i class="fa 
fa-external-link"></i> Security</a></li>
+<li><a href="http://www.apache.org/foundation/thanks.html";><i class="fa 
fa-external-link"></i> Thanks</a></li>
+</ul>
+</li>
+</ul>
+
+  </div>
+
+</div>
+</nav>
+
+
+<div class="container-fluid">
+<div class="row">
+  <div class="col-md-2" id="sidebar">
+  <div style="text-align: center">
+    <h1><a href="/index.html">Apache Slider (incubating)</a></h1>
+    <hr>
+Latest release: <strong>0.60.0-incubating</strong><br>
+    <br>
+    <a id="download-button-sidebar" class="btn btn-success btn-block" 
href="/downloads/" role="button">Download</a>
+  </div>
+    <hr>
+    <a href="http://incubator.apache.org";><img id="logo" alt="Apache Incubator 
&trade;" class="img-responsive" 
src="http://incubator.apache.org/images/apache-incubator-logo.png"/></a>
+  </div>
+  <div class="col-md-8 col-md-offset-1">
+
+  <div id="content">
+
+    <h1 class="title"></h1>
+
+    <!---
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License. See accompanying LICENSE file.
+-->
+
+<h1 id="title">title</h1>
+  </div>
+
+  <div id="footer">
+    <a alt="Apache Software Foundation" href="http://www.apache.org";>
+      <img id="asf-logo" alt="Apache Software Foundation" 
src="/images/feather-small.gif" width="100">
+    </a>
+    <div class="copyright">
+      <p>
+        Copyright &copy; 2011-2014 The Apache Software Foundation, Licensed 
under
+        the <a href="http://www.apache.org/licenses/LICENSE-2.0";>Apache 
License, Version 2.0</a>.
+        Apache Slider, Slider, Apache, the Apache feather logo, and the Apache 
Incubator
+        project logo are trademarks of the <a 
href="http://www.apache.org";>Apache Software Foundation</a>.<br />
+        Site created with <a href="http://getbootstrap.com/";>Bootstrap</a> 
including icons from <a href="http://glyphicons.com/";>GLYPHICONS</a> and <a 
href="http://fontawesome.io/";>Font Awesome</a>.
+      </p>
+    </div> 
+  </div>
+  </div>
+
+</div>
+</div>
+
+<script type="text/javascript">
+
+</script>
+</body>
+</html>

Modified: websites/staging/slider/trunk/content/docs/configuration/core.html
==============================================================================
--- websites/staging/slider/trunk/content/docs/configuration/core.html 
(original)
+++ websites/staging/slider/trunk/content/docs/configuration/core.html Wed Mar 
25 17:59:38 2015
@@ -177,7 +177,7 @@ Latest release: <strong>0.60.0-incubatin
    limitations under the License.
 -->
 
-<h1 id="apache-slider-core-configuration-specification">Apache Slider Core 
Configuration Specification</h1>
+<h1 id="apache-slider-core-configuration-specification-version-20">Apache 
Slider Core Configuration Specification, version 2.0</h1>
 <h2 id="terminology">Terminology</h2>
 <p><em>Application</em> A single application, such as an HBase cluster. An 
application
 is distribed across the YARN cluster.</p>
@@ -195,6 +195,8 @@ and what their resource requirements are
 <p><em><code>application.json</code></em>: A file that describes the
 size of the application in terms of its component requirements: how many,
 and what their resource requirements are. </p>
+<p><em><code>internal.json</code></em>: A file which contains Slider's 
internal configuration
+parameters.</p>
 <h2 id="structure">Structure</h2>
 <p>Configurations are stored in well-formed JSON files. 
 1. Text MUST be saved in the UTF-8 format.
@@ -215,8 +217,9 @@ and what their resource requirements are
 <li>A component  section, <code>/components</code>.</li>
 <li>0 or more sections under <code>/components</code> for each component, 
identified by component name,
  containing string properties.</li>
-<li>0 or 1 section <code>/metadata</code> containing arbitrary metadata (such 
as a description,
+<li>An optional section <code>/metadata</code> containing arbitrary metadata 
(such as a description,
 author, or any other information that is not parsed or processed 
directly).</li>
+<li>An optional section, <code>/credentials</code> containing security 
information.</li>
 </ol>
 <p>The simplest valid specification file is </p>
 <div class="codehilite"><pre><span class="p">{</span>
@@ -423,36 +426,6 @@ of an application.</p>
 <p>This declares this deployment of the application to consist of one instance 
of
 the master component, using 1 vcore and 1024MB of RAM, and five worker 
components
 each using one vcore and 512 MB of RAM.</p>
-<h2 id="internal-information-internaljson">Internal information, 
<code>internal.json</code></h2>
-<p>This contains internal data related to the deployment -it is not
-intended for manual editing.</p>
-<p>There MAY be a component, <code>diagnostics</code>. If defined, its content 
contains
-diagnostic information for support calls, and MUST NOT be interpreted
-during application deployment, (though it may be included in the generation
-of diagnostics reports)</p>
-<div class="codehilite"><pre><span class="p">{</span>
-  &quot;<span class="n">schema</span>&quot;<span class="p">:</span> 
&quot;<span class="n">http</span><span class="p">:</span><span 
class="o">//</span><span class="n">example</span><span class="p">.</span><span 
class="n">org</span><span class="o">/</span><span 
class="n">specification</span><span class="o">/</span><span 
class="n">v2</span><span class="p">.</span>0<span 
class="p">.</span>0&quot;<span class="p">,</span>
-
-  &quot;<span class="n">metadata</span>&quot;<span class="p">:</span> <span 
class="p">{</span>
-    &quot;<span class="n">description</span>&quot;<span class="p">:</span> 
&quot;<span class="n">Internal</span> <span class="n">configuration</span> 
<span class="n">DO</span> <span class="n">NOT</span> <span 
class="n">EDIT</span>&quot;
-  <span class="p">},</span>
-  &quot;<span class="k">global</span>&quot;<span class="p">:</span> <span 
class="p">{</span>
-    &quot;<span class="n">name</span>&quot;<span class="p">:</span> 
&quot;<span class="n">small_cluster</span>&quot;<span class="p">,</span>
-    &quot;<span class="n">application</span>&quot;<span class="p">:</span> 
&quot;<span class="n">hdfs</span><span class="p">:</span><span 
class="o">//</span><span class="n">cluster</span><span 
class="p">:</span>8020<span class="o">/</span><span class="n">apps</span><span 
class="o">/</span><span class="n">hbase</span><span class="o">/</span><span 
class="n">v</span><span class="o">/</span>1<span class="p">.</span>0<span 
class="p">.</span>0<span class="o">/</span><span 
class="n">application</span><span class="p">.</span><span 
class="n">tar</span>&quot;
-  <span class="p">},</span>
-  &quot;<span class="n">components</span>&quot;<span class="p">:</span> <span 
class="p">{</span>
-
-    &quot;<span class="n">diagnostics</span>&quot;<span class="p">:</span> 
<span class="p">{</span>
-      &quot;<span class="n">create</span><span class="p">.</span><span 
class="n">hadoop</span><span class="p">.</span><span 
class="n">deployed</span><span class="p">.</span><span 
class="n">info</span>&quot;<span class="p">:</span> &quot;<span 
class="p">(</span><span class="n">release</span><span class="o">-</span>2<span 
class="p">.</span>3<span class="p">.</span>0<span class="p">)</span> <span 
class="p">@</span><span class="n">dfe463</span>&quot;<span class="p">,</span>
-      &quot;<span class="n">create</span><span class="p">.</span><span 
class="n">hadoop</span><span class="p">.</span><span 
class="n">build</span><span class="p">.</span><span 
class="n">info</span>&quot;<span class="p">:</span> &quot;2<span 
class="p">.</span>3<span class="p">.</span>0&quot;<span class="p">,</span>
-      &quot;<span class="n">create</span><span class="p">.</span><span 
class="n">time</span><span class="p">.</span><span 
class="n">millis</span>&quot;<span class="p">:</span> 
&quot;1393512091276&quot;<span class="p">,</span>
-      &quot;<span class="n">create</span><span class="p">.</span><span 
class="n">time</span>&quot;<span class="p">:</span> &quot;27 <span 
class="n">Feb</span> 2014 14<span class="p">:</span>41<span 
class="p">:</span>31 <span class="n">GMT</span>&quot;
-    <span class="p">}</span>
-  <span class="p">}</span>
-<span class="p">}</span>
-</pre></div>
-
-
 <h2 id="deployment-specification-app_configurationjson">Deployment 
specification: <code>app_configuration.json</code></h2>
 <p>This defines parameters that are to be used when creating the instance of 
the
 application, and instances of the individual components.</p>
@@ -480,6 +453,8 @@ application, and instances of the indivi
       &quot;<span class="n">jvm</span><span class="p">.</span><span 
class="n">heapsize</span>&quot;<span class="p">:</span> &quot;512<span 
class="n">M</span>&quot;
     <span class="p">}</span>
   <span class="p">}</span>
+  &quot;<span class="n">credentials</span>&quot; <span class="p">{</span>
+  <span class="p">}</span>
 <span class="p">}</span>
 </pre></div>
 
@@ -527,6 +502,8 @@ different components.</p>
       &quot;<span class="n">jvm</span><span class="p">.</span><span 
class="n">heapsize</span>&quot;<span class="p">:</span> &quot;512<span 
class="n">M</span>&quot;
     <span class="p">}</span>
   <span class="p">}</span>
+  &quot;<span class="n">credentials</span>&quot; <span class="p">{</span>
+  <span class="p">}</span>
 <span class="p">}</span>
 </pre></div>
 
@@ -538,16 +515,24 @@ to create local configurations incompati
 there is no way to declare an attribute as final). It is the responsibility
 of the author of the configuration file (and their tools) to detect such 
issues.</p>
 <h3 id="key-application-configuration-items">Key Application Configuration 
Items</h3>
-<p>The following sections provides details about certain application 
configuration properties that can be utilized to tailor the deployment of a 
given application:</p>
+<p>The following sections provides details about certain application 
configuration
+ properties that can be utilized to tailor the deployment of a given 
application:</p>
 <h4 id="controlling-assigned-port-ranges">Controlling assigned port ranges</h4>
-<p>For certain deployments, the ports available for communication with clients 
(Web UI ports, RPC ports, etc) are restricted to a specific set (e.g when 
leveraging a firewall).  In those situations you can designate the set of 
allowed ports with the "site.global.slider.allowed.ports" setting.  This 
settings takes a comma-delimited set of port numbers and ranges, e.g.:</p>
+<p>For certain deployments, the ports available for communication with clients
+(Web UI ports, RPC ports, etc) are restricted to a specific set (e.g when 
using a firewall).
+In those situations you can designate the set of allowed ports with the
+<code>site.global.slider.allowed.ports</code> setting. </p>
+<p>This takes a comma-delimited set of port numbers and ranges, e.g.:</p>
 <div class="codehilite"><pre>&quot;<span class="n">site</span><span 
class="p">.</span><span class="k">global</span><span class="p">.</span><span 
class="n">slider</span><span class="p">.</span><span 
class="n">allowed</span><span class="p">.</span><span 
class="n">ports</span>&quot;<span class="p">:</span> &quot;48000<span 
class="p">,</span> 49000<span class="p">,</span> 50001<span 
class="o">-</span>50010&quot;
 </pre></div>
 
 
-<p>The AM exposed ports (Web UI, RPC), as well as the ports allocated to 
launched application containers, will be limited to the ranges specified by the 
property value.</p>
+<p>The AM exposed ports (Web UI, RPC), as well as the ports allocated to 
launched
+application containers, will be limited to the ranges specified by the 
property value.</p>
 <h4 id="delaying-container-launch">Delaying container launch</h4>
-<p>In situations where container restarts may need to be delayed to allow for 
platform resources to be released (e.g. a port assigned to a container that is 
stopped may be slow to release), a delay can be designated by setting the 
"container.launch.delay.sec" property in the component's configuration 
section:</p>
+<p>In situations where container restarts may need to be delayed to allow for
+platform resources to be released (e.g. a port assigned to a previous container
+may be slow to release), a delay can be designated by setting the 
<code>container.launch.delay.sec</code> property.</p>
 <div class="codehilite"><pre>&quot;<span class="n">worker</span>&quot;<span 
class="p">:</span> <span class="p">{</span>
    &quot;<span class="n">jvm</span><span class="p">.</span><span 
class="n">heapsite</span>&quot;<span class="p">:</span> &quot;512<span 
class="n">M</span>&quot;<span class="p">,</span>
    &quot;<span class="n">container</span><span class="p">.</span><span 
class="n">launch</span><span class="p">.</span><span 
class="n">delay</span><span class="p">.</span><span 
class="nb">sec</span>&quot;<span class="p">:</span> &quot;30&quot;
@@ -556,7 +541,11 @@ of the author of the configuration file
 
 
 <h4 id="specifying-the-python-executable-path">Specifying the Python 
Executable Path</h4>
-<p>Currently the Slider containers leverage python for component scripts (the 
scripts responsible for component lifecycle operations).  When deploying 
applications on certain variations of linux or other operating systems (e.g. 
Centos 5) , the version of python on the system path may be incompatible with 
the component script (e.g. methods or imports utilized are not available).  In 
those circumstances the path to the python executable for container script 
execution can be specified by the "agent.python.exec.path" property:   </p>
+<p>Slider containers use python for component scripts in the containers. 
+When deploying applications on certain variations of linux or other operating 
systems (e.g. Centos 5),
+the version of python on the system PATH may be incompatible with the 
component script
+In those circumstances the path to the python executable for container script 
execution can be
+specified by the <code>agent.python.exec.path</code> property: </p>
 <div class="codehilite"><pre>  &quot;<span class="k">global</span>&quot;<span 
class="p">:</span> <span class="p">{</span>
     &quot;<span class="n">agent</span><span class="p">.</span><span 
class="n">python</span><span class="p">.</span><span class="n">exec</span><span 
class="p">.</span><span class="n">path</span>&quot;<span class="p">:</span> 
&quot;<span class="o">/</span><span class="n">usr</span><span 
class="o">/</span><span class="n">bin</span><span class="o">/</span><span 
class="n">python</span>&quot;<span class="p">,</span>
     <span class="p">.</span> <span class="p">.</span> <span class="p">.</span>
@@ -564,7 +553,8 @@ of the author of the configuration file
 </pre></div>
 
 
-<p>This property may also be specified in the slider-client.xml file 
(typically in the "conf" directory of the slider installation) if the python 
version specified is to be utilized across multiple deployments:</p>
+<p>This property may also be specified in the <code>slider-client.xml</code> 
file (typically in the "conf" directory
+of the slider installation) if the python version specified is to be utilized 
across multiple deployments:</p>
 <div class="codehilite"><pre><span class="nt">&lt;property&gt;</span>
   <span class="nt">&lt;name&gt;</span>agent.python.exec.path<span 
class="nt">&lt;/name&gt;</span>
   <span class="nt">&lt;value&gt;</span>/usr/bin/python<span 
class="nt">&lt;/value&gt;</span>

Modified: websites/staging/slider/trunk/content/docs/configuration/index.html
==============================================================================
--- websites/staging/slider/trunk/content/docs/configuration/index.html 
(original)
+++ websites/staging/slider/trunk/content/docs/configuration/index.html Wed Mar 
25 17:59:38 2015
@@ -183,20 +183,15 @@ Latest release: <strong>0.60.0-incubatin
 <li>The persistent description of an application's configuration</li>
 <li>The persistent description of the desired topology and YARN resource
 requirements.</li>
-<li>The dynamic description of the running application, including information
-on the location of components and aggregated statistics. </li>
-</ol>
-<p>The specifics of this are covered in the <a href="core.html">Core 
Configuration Specification</a></p>
-<h2 id="historical-references">Historical References</h2>
-<ol>
-<li><a href="specification.html">Specification</a></li>
 <li>
-<p><a href="redesign.html">Redesign</a></p>
+<p>The dynamic description of the running application, including information
+on the location of components and aggregated statistics. </p>
 </li>
 <li>
-<p><a href="original-hbase.json">Example: current</a></p>
+<p><a href="core.html">Core Configuration Specification</a></p>
 </li>
-<li><a href="proposed-hbase.json">Example: proposed</a></li>
+<li><a href="internal.html">internal.json</a></li>
+<li><a href="resources.html">resources.json</a></li>
 </ol>
   </div>
 

Added: websites/staging/slider/trunk/content/docs/configuration/internal.html
==============================================================================
--- websites/staging/slider/trunk/content/docs/configuration/internal.html 
(added)
+++ websites/staging/slider/trunk/content/docs/configuration/internal.html Wed 
Mar 25 17:59:38 2015
@@ -0,0 +1,237 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <link href="/css/bootstrap.min.css" rel="stylesheet">
+  <link href="/css/bootstrap-theme.min.css" rel="stylesheet">
+  <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+  <!--[if lt IE 9]>
+    <script 
src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js";></script>
+    <script 
src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js";></script>
+  <![endif]-->
+  <script 
src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js";></script>
+  <script src="/js/bootstrap.min.js"></script>
+  <link href="/css/slider.css" rel="stylesheet" type="text/css">
+  <link 
href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css" 
rel="stylesheet">
+  <title></title>
+  
+</head>
+
+<body>
+<nav class="navbar navbar-default navbar-fixed-top" role="navigation">
+<div class="container-fluid">
+  <div class="navbar-header">
+    <button type="button" class="navbar-toggle" data-toggle="collapse" 
data-target="#navbar-items">
+      <span class="sr-only">Toggle navigation</span>
+      <span class="icon-bar"></span>
+      <span class="icon-bar"></span>
+      <span class="icon-bar"></span>
+    </button>
+    <a class="navbar-brand" href="/index.html">Slider</a>
+  </div>
+  <div class="collapse navbar-collapse" id="navbar-items">
+  <ul class="nav navbar-nav">
+    <li class="dropdown">
+      <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+        Project <span class="caret"></span>
+      </a>
+<ul class="dropdown-menu">
+<li id="nav_index"><a href="/index.html">Home</a></li>
+<li id="nav_downloads"><a href="/downloads">Downloads</a></li>
+<li id="nav_source"><a 
href="https://git-wip-us.apache.org/repos/asf/incubator-slider.git";><i 
class="fa fa-external-link"></i> Source</a></li>
+<li><a href="http://www.apache.org/licenses/LICENSE-2.0";><i class="fa 
fa-external-link"></i> License</a></li>
+<li class="divider"></li>
+<li class="dropdown-header">Community</li>
+<li id="nav_team"><a href="/team.html">Team</a></li>
+<li id="nav_mailinglists"><a href="/mailing_lists.html">Mailing Lists</a></li>
+<li class="divider"></li>
+<li class="dropdown-header">Tools</li>
+<li id="nav_jira"><a href="https://issues.apache.org/jira/browse/SLIDER";><i 
class="fa fa-external-link"></i> Issues</a></li>
+<li id="nav_builds"><a href="https://builds.apache.org/job/Slider-develop";><i 
class="fa fa-external-link"></i> Builds</a></li>
+</ul>
+</li>
+
+    <li class="dropdown">
+      <a class="dropdown-toggle" data-toggle="dropdown" href="/design">
+        Design <span class="caret"></span>
+      </a>
+<ul class="dropdown-menu">
+<li id="nav_design_overview"><a 
href="/design/architecture.html">Overview</a></li>
+<li id="nav_app_needs"><a 
href="/docs/slider_specs/application_needs.html">Application Needs</a></li>
+<li id="nav_spec"><a href="/design/specification/index.html">Expected 
Behavior</a></li>
+<li id="nav_registry"><a href="/design/registry/index.html">Service 
Registry</a></li>
+<li id="nav_ssl_impl"><a href="/design/ssl_implementation.html">SSL 
Implementation</a></li>
+<li id="nav_role_history"><a href="/design/rolehistory.html">Role 
History</a></li>
+</ul>
+</li>
+
+
+    <li class="dropdown">
+      <a class="dropdown-toggle" data-toggle="dropdown" href="/developing">
+        Developing <span class="caret"></span>
+      </a>
+<ul class="dropdown-menu">
+<li id="nav_dev_building"><a href="/developing/building.html">Building</a></li>
+<li id="nav_dev_debugging"><a 
href="/developing/debugging.html">Debugging</a></li>
+<li id="nav_dev_testing"><a href="/developing/testing.html">Testing</a></li>
+<li id="nav_dev_funtesting"><a 
href="/developing/functional_tests.html">Functional Testing</a></li>
+<li id="nav_dev_manual_testing"><a 
href="/developing/manual_testing.html">Manual Testing</a></li>
+<li id="nav_releasing"><a href="/developing/releasing.html">Releasing</a></li>
+</ul>
+</li>
+
+    <li class="dropdown">
+      <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+        Using <span class="caret"></span>
+      </a>
+<ul class="dropdown-menu">
+<li id="nav_use_getting_started"><a href="/docs/getting_started.html">Getting 
Started</a></li>
+<li id="nav_use_manpage"><a href="/docs/manpage.html">Man Page</a></li>
+<li role="presentation" class="divider"></li>
+<li id="nav_use_app_package"><a href="/docs/slider_specs/index.html">Creating 
App Packages</a></li>
+<li role="presentation" class="divider"></li>
+<li id="nav_use_client_config"><a 
href="/docs/client-configuration.html">Client Configuration</a></li>
+<li id="nav_use_exitcodes"><a href="/docs/exitcodes.html">Client Exit 
Codes</a></li>
+<li role="presentation" class="divider"></li>
+<li id="nav_use_debugging"><a 
href="/developing/debugging.html">Debugging</a></li>
+<li id="nav_use_troubleshooting"><a 
href="/docs/troubleshooting.html">Troubleshooting</a></li>
+<li role="presentation" class="divider"></li>
+<li id="nav_use_high_availability"><a href="/docs/high_availability.html">High 
Availability</a></li>
+<li id="nav_use_security"><a href="/docs/security.html">Security</a></li>
+<li id="nav_am_agent_ssl"><a href="/docs/ssl.html">Agent to AM SSL</a></li>
+<li id="nav_use_app_configuration"><a 
href="/docs/configuration/index.html">App Configuration Model</a></li>
+<li id="nav_use_examples"><a href="/docs/examples.html">Provider 
Examples</a></li>
+</ul>
+</li>
+
+    <li class="dropdown">
+      <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+        ASF Links <span class="caret"></span>
+      </a>
+<ul class="dropdown-menu">
+<li><a href="http://www.apache.org";><i class="fa fa-external-link"></i> Apache 
Software Foundation</a></li>
+<li><a href="http://www.apache.org/foundation/sponsorship.html";><i class="fa 
fa-external-link"></i> Sponsorship</a></li>
+<li><a href="http://www.apache.org/security/";><i class="fa 
fa-external-link"></i> Security</a></li>
+<li><a href="http://www.apache.org/foundation/thanks.html";><i class="fa 
fa-external-link"></i> Thanks</a></li>
+</ul>
+</li>
+</ul>
+
+  </div>
+
+</div>
+</nav>
+
+
+<div class="container-fluid">
+<div class="row">
+  <div class="col-md-2" id="sidebar">
+  <div style="text-align: center">
+    <h1><a href="/index.html">Apache Slider (incubating)</a></h1>
+    <hr>
+Latest release: <strong>0.60.0-incubating</strong><br>
+    <br>
+    <a id="download-button-sidebar" class="btn btn-success btn-block" 
href="/downloads/" role="button">Download</a>
+  </div>
+    <hr>
+    <a href="http://incubator.apache.org";><img id="logo" alt="Apache Incubator 
&trade;" class="img-responsive" 
src="http://incubator.apache.org/images/apache-incubator-logo.png"/></a>
+  </div>
+  <div class="col-md-8 col-md-offset-1">
+
+  <div id="content">
+
+    <h1 class="title"></h1>
+
+    <!---
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License. See accompanying LICENSE file.
+-->
+
+<h1 id="internaljson-sliders-internal-configuration-document">internal.json: 
slider's internal configuration document</h1>
+<h2 id="internal-information-internaljson">Internal information, 
<code>internal.json</code></h2>
+<p>This contains internal data related to the deployment —it is not
+intended for normal use.</p>
+<p>There MAY be a component, <code>diagnostics</code>. If defined, its content 
contains
+diagnostic information for support calls, and MUST NOT be interpreted
+during application deployment, (though it may be included in the generation
+of diagnostics reports)</p>
+<div class="codehilite"><pre><span class="p">{</span>
+  &quot;<span class="n">schema</span>&quot;<span class="p">:</span> 
&quot;<span class="n">http</span><span class="p">:</span><span 
class="o">//</span><span class="n">example</span><span class="p">.</span><span 
class="n">org</span><span class="o">/</span><span 
class="n">specification</span><span class="o">/</span><span 
class="n">v2</span><span class="p">.</span>0<span 
class="p">.</span>0&quot;<span class="p">,</span>
+
+  &quot;<span class="n">metadata</span>&quot;<span class="p">:</span> <span 
class="p">{</span>
+    &quot;<span class="n">description</span>&quot;<span class="p">:</span> 
&quot;<span class="n">Internal</span> <span class="n">configuration</span> 
<span class="n">DO</span> <span class="n">NOT</span> <span 
class="n">EDIT</span>&quot;
+  <span class="p">},</span>
+  &quot;<span class="k">global</span>&quot;<span class="p">:</span> <span 
class="p">{</span>
+    &quot;<span class="n">name</span>&quot;<span class="p">:</span> 
&quot;<span class="n">small_cluster</span>&quot;<span class="p">,</span>
+    &quot;<span class="n">application</span>&quot;<span class="p">:</span> 
&quot;<span class="n">hdfs</span><span class="p">:</span><span 
class="o">//</span><span class="n">cluster</span><span 
class="p">:</span>8020<span class="o">/</span><span class="n">apps</span><span 
class="o">/</span><span class="n">hbase</span><span class="o">/</span><span 
class="n">v</span><span class="o">/</span>1<span class="p">.</span>0<span 
class="p">.</span>0<span class="o">/</span><span 
class="n">application</span><span class="p">.</span><span 
class="n">tar</span>&quot;
+  <span class="p">},</span>
+  &quot;<span class="n">components</span>&quot;<span class="p">:</span> <span 
class="p">{</span>
+
+    &quot;<span class="n">diagnostics</span>&quot;<span class="p">:</span> 
<span class="p">{</span>
+      &quot;<span class="n">create</span><span class="p">.</span><span 
class="n">hadoop</span><span class="p">.</span><span 
class="n">deployed</span><span class="p">.</span><span 
class="n">info</span>&quot;<span class="p">:</span> &quot;<span 
class="p">(</span><span class="n">release</span><span class="o">-</span>2<span 
class="p">.</span>3<span class="p">.</span>0<span class="p">)</span> <span 
class="p">@</span><span class="n">dfe463</span>&quot;<span class="p">,</span>
+      &quot;<span class="n">create</span><span class="p">.</span><span 
class="n">hadoop</span><span class="p">.</span><span 
class="n">build</span><span class="p">.</span><span 
class="n">info</span>&quot;<span class="p">:</span> &quot;2<span 
class="p">.</span>3<span class="p">.</span>0&quot;<span class="p">,</span>
+      &quot;<span class="n">create</span><span class="p">.</span><span 
class="n">time</span><span class="p">.</span><span 
class="n">millis</span>&quot;<span class="p">:</span> 
&quot;1393512091276&quot;<span class="p">,</span>
+      &quot;<span class="n">create</span><span class="p">.</span><span 
class="n">time</span>&quot;<span class="p">:</span> &quot;27 <span 
class="n">Feb</span> 2014 14<span class="p">:</span>41<span 
class="p">:</span>31 <span class="n">GMT</span>&quot;
+    <span class="p">}</span>
+  <span class="p">}</span>
+<span class="p">}</span>
+</pre></div>
+
+
+<h2 id="chaos-monkey">Chaos Monkey</h2>
+<p>The Slider application has a built in "Chaos Monkey", which is configured 
in the <code>internal.json</code>
+file.:</p>
+<p>Consult <a href="../developing/chaosmonkey.html">"configuring the Slider 
Chaos Monkey"</a> for details.</p>
+  </div>
+
+  <div id="footer">
+    <a alt="Apache Software Foundation" href="http://www.apache.org";>
+      <img id="asf-logo" alt="Apache Software Foundation" 
src="/images/feather-small.gif" width="100">
+    </a>
+    <div class="copyright">
+      <p>
+        Copyright &copy; 2011-2014 The Apache Software Foundation, Licensed 
under
+        the <a href="http://www.apache.org/licenses/LICENSE-2.0";>Apache 
License, Version 2.0</a>.
+        Apache Slider, Slider, Apache, the Apache feather logo, and the Apache 
Incubator
+        project logo are trademarks of the <a 
href="http://www.apache.org";>Apache Software Foundation</a>.<br />
+        Site created with <a href="http://getbootstrap.com/";>Bootstrap</a> 
including icons from <a href="http://glyphicons.com/";>GLYPHICONS</a> and <a 
href="http://fontawesome.io/";>Font Awesome</a>.
+      </p>
+    </div> 
+  </div>
+  </div>
+
+</div>
+</div>
+
+<script type="text/javascript">
+
+</script>
+</body>
+</html>


Reply via email to