Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
@gerardparis
gerardparis committed Sep 21, 2016
2 parents f14d575 + e769b74 commit 1b01b6c
Show file tree
Hide file tree
Showing 15 changed files with 44 additions and 28 deletions.
Binary file modified api/docs/_build/doctrees/environment.pickle
View file
Binary file not shown.
Binary file modified api/docs/_build/doctrees/index.doctree
View file
Binary file not shown.
Binary file modified api/docs/_build/doctrees/registry/rules.doctree
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion api/docs/_build/html/.buildinfo
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Sphinx build info version 1
# This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
config: e1a9e3163d81e98af586eed406046bdc
config: 9a9e7a269e6f23cd7252e17e27578cf2
tags: 645f666f9bcd5a90fca523b33c5a78b7
2 changes: 1 addition & 1 deletion api/docs/_build/html/_sources/registry/metrics.txt
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Metrics
===============
=======
.. automodule:: registry.dynamic_policies.metrics.__init__
:members:
.. automodule:: registry.dynamic_policies.metrics.abstract_metric
Expand Down
2 changes: 1 addition & 1 deletion api/docs/_build/html/_sources/registry/rules.txt
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Rules
======
=====
.. automodule:: registry.dynamic_policies.rules.__init__
:members:
.. automodule:: registry.dynamic_policies.rules.rule
Expand Down
1 change: 1 addition & 0 deletions api/docs/_build/html/_static/default.css
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
@import url("classic.css");
10 changes: 0 additions & 10 deletions api/docs/_build/html/registry/consumer.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
<script type="text/javascript" src="../_static/underscore.js"></script>
<script type="text/javascript" src="../_static/doctools.js"></script>
<link rel="top" title="Crystal Controller 1.0.0 documentation" href="../index.html" />
<link rel="next" title="Swift Views" href="../swift/views.html" />
<link rel="prev" title="Rules" href="rules.html" />
</head>
<body role="document">
Expand All @@ -37,9 +36,6 @@ <h3>Navigation</h3>
<li class="right" >
<a href="../py-modindex.html" title="Python Module Index"
>modules</a> |</li>
<li class="right" >
<a href="../swift/views.html" title="Swift Views"
accesskey="N">next</a> |</li>
<li class="right" >
<a href="rules.html" title="Rules"
accesskey="P">previous</a> |</li>
Expand All @@ -65,9 +61,6 @@ <h3>Navigation</h3>
<h4>Previous topic</h4>
<p class="topless"><a href="rules.html"
title="previous chapter">Rules</a></p>
<h4>Next topic</h4>
<p class="topless"><a href="../swift/views.html"
title="next chapter">Swift Views</a></p>
<div role="note" aria-label="source link">
<h3>This Page</h3>
<ul class="this-page-menu">
Expand Down Expand Up @@ -98,9 +91,6 @@ <h3>Navigation</h3>
<li class="right" >
<a href="../py-modindex.html" title="Python Module Index"
>modules</a> |</li>
<li class="right" >
<a href="../swift/views.html" title="Swift Views"
>next</a> |</li>
<li class="right" >
<a href="rules.html" title="Rules"
>previous</a> |</li>
Expand Down
10 changes: 5 additions & 5 deletions api/docs/_build/html/registry/metrics.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<script type="text/javascript" src="../_static/doctools.js"></script>
<link rel="top" title="Crystal Controller 1.0.0 documentation" href="../index.html" />
<link rel="next" title="Rules" href="rules.html" />
<link rel="prev" title="Registry Views" href="views.html" />
<link rel="prev" title="Swift Views" href="../swift/views.html" />
</head>
<body role="document">
<div class="related" role="navigation" aria-label="related navigation">
Expand All @@ -41,7 +41,7 @@ <h3>Navigation</h3>
<a href="rules.html" title="Rules"
accesskey="N">next</a> |</li>
<li class="right" >
<a href="views.html" title="Registry Views"
<a href="../swift/views.html" title="Swift Views"
accesskey="P">previous</a> |</li>
<li class="nav-item nav-item-0"><a href="../index.html">Crystal Controller 1.0.0 documentation</a> &raquo;</li>
</ul>
Expand Down Expand Up @@ -144,8 +144,8 @@ <h3>Navigation</h3>
<div class="sphinxsidebar" role="navigation" aria-label="main navigation">
<div class="sphinxsidebarwrapper">
<h4>Previous topic</h4>
<p class="topless"><a href="views.html"
title="previous chapter">Registry Views</a></p>
<p class="topless"><a href="../swift/views.html"
title="previous chapter">Swift Views</a></p>
<h4>Next topic</h4>
<p class="topless"><a href="rules.html"
title="next chapter">Rules</a></p>
Expand Down Expand Up @@ -183,7 +183,7 @@ <h3>Navigation</h3>
<a href="rules.html" title="Rules"
>next</a> |</li>
<li class="right" >
<a href="views.html" title="Registry Views"
<a href="../swift/views.html" title="Swift Views"
>previous</a> |</li>
<li class="nav-item nav-item-0"><a href="../index.html">Crystal Controller 1.0.0 documentation</a> &raquo;</li>
</ul>
Expand Down
2 changes: 1 addition & 1 deletion api/docs/_build/html/searchindex.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 15 additions & 5 deletions api/docs/_build/html/swift/views.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@
<script type="text/javascript" src="../_static/underscore.js"></script>
<script type="text/javascript" src="../_static/doctools.js"></script>
<link rel="top" title="Crystal Controller 1.0.0 documentation" href="../index.html" />
<link rel="prev" title="Consumer" href="../registry/consumer.html" />
<link rel="next" title="Metrics" href="../registry/metrics.html" />
<link rel="prev" title="Registry Views" href="../registry/views.html" />
</head>
<body role="document">
<div class="related" role="navigation" aria-label="related navigation">
Expand All @@ -37,7 +38,10 @@ <h3>Navigation</h3>
<a href="../py-modindex.html" title="Python Module Index"
>modules</a> |</li>
<li class="right" >
<a href="../registry/consumer.html" title="Consumer"
<a href="../registry/metrics.html" title="Metrics"
accesskey="N">next</a> |</li>
<li class="right" >
<a href="../registry/views.html" title="Registry Views"
accesskey="P">previous</a> |</li>
<li class="nav-item nav-item-0"><a href="../index.html">Crystal Controller 1.0.0 documentation</a> &raquo;</li>
</ul>
Expand Down Expand Up @@ -97,8 +101,11 @@ <h3>Navigation</h3>
<div class="sphinxsidebar" role="navigation" aria-label="main navigation">
<div class="sphinxsidebarwrapper">
<h4>Previous topic</h4>
<p class="topless"><a href="../registry/consumer.html"
title="previous chapter">Consumer</a></p>
<p class="topless"><a href="../registry/views.html"
title="previous chapter">Registry Views</a></p>
<h4>Next topic</h4>
<p class="topless"><a href="../registry/metrics.html"
title="next chapter">Metrics</a></p>
<div role="note" aria-label="source link">
<h3>This Page</h3>
<ul class="this-page-menu">
Expand Down Expand Up @@ -130,7 +137,10 @@ <h3>Navigation</h3>
<a href="../py-modindex.html" title="Python Module Index"
>modules</a> |</li>
<li class="right" >
<a href="../registry/consumer.html" title="Consumer"
<a href="../registry/metrics.html" title="Metrics"
>next</a> |</li>
<li class="right" >
<a href="../registry/views.html" title="Registry Views"
>previous</a> |</li>
<li class="nav-item nav-item-0"><a href="../index.html">Crystal Controller 1.0.0 documentation</a> &raquo;</li>
</ul>
Expand Down

0 comments on commit 1b01b6c

Please sign in to comment.