From 024f276829f837393be9c1d5e13bb8b0434a3605 Mon Sep 17 00:00:00 2001 From: Ronald van Zantvoort Date: Wed, 27 May 2015 17:38:39 +0200 Subject: [PATCH] doc fixes --- salt/modules/data.py | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/salt/modules/data.py b/salt/modules/data.py index cc53c0283e..4f23d1a989 100644 --- a/salt/modules/data.py +++ b/salt/modules/data.py @@ -160,6 +160,8 @@ def get(key, default=None): ''' Get a (list of) value(s) from the minion datastore + .. versionadded:: Beryllium + CLI Example: .. code-block:: bash @@ -178,7 +180,9 @@ def get(key, default=None): def keys(): ''' - Get keys from the minion datastore + Get all keys from the minion datastore + + .. versionadded:: Beryllium CLI Example: @@ -194,6 +198,8 @@ def values(): ''' Get values from the minion datastore + .. versionadded:: Beryllium + CLI Example: .. code-block:: bash @@ -208,6 +214,8 @@ def items(): ''' Get items from the minion datastore + .. versionadded:: Beryllium + CLI Example: .. code-block:: bash @@ -220,13 +228,15 @@ def items(): def has_key(key): ''' - Get items from the minion datastore + Check if key is in the minion datastore + + .. versionadded:: Beryllium CLI Example: .. code-block:: bash - salt '*' data.items + salt '*' data.has_key ''' store = load() return key in store @@ -236,11 +246,13 @@ def pop(key, default=None): ''' Pop (return & delete) a value from the minion datastore + .. versionadded:: Beryllium + CLI Example: .. code-block:: bash - salt '*' data.pop False + salt '*' data.pop "there was no val" ''' store = load() val = store.pop(key, default)