Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
advornic committed Jul 28, 2015
2 parents 578a2e8 + 833902f commit 1493ee7
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 12 deletions.
5 changes: 2 additions & 3 deletions docs/config.rst
Original file line number Diff line number Diff line change
Expand Up @@ -786,13 +786,12 @@ example.
**allocate(resource_pool)**

``[data_root]/resources/`` contains global resource pools from which
attributes in definitions can be allocated via the ``allocate(resource_pool)``
plugin.
attributes in definitions can be allocated.

The resource pools provide a way to dynamically allocate a resource to a
node when the node definition is created. The resource pools are
key/value YAML files that contain a set of resources to be allocated to
a node (whenever the ``allocate(resource_pool)`` plugin is used in the definition).
a node.

.. code-block:: console
Expand Down
7 changes: 0 additions & 7 deletions requirements-dev.txt

This file was deleted.

5 changes: 3 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
webob
routes
pyyaml
jsonrpclib
requests
sleekxmpp
sleekxmpp # dev only
mock # dev only
jsonrpclib # dev only
3 changes: 3 additions & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,9 @@ def join_url(x, y):
version = None

install_requirements = open('requirements.txt').read().split('\n')
install_requirements = [x.strip() for x in install_requirements
if x.strip() and
'dev only' not in x]
version = open('VERSION').read().split()[0].strip()

data_files = []
Expand Down

0 comments on commit 1493ee7

Please sign in to comment.