Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ Added

Fixed
~~~~~
* Fixed a bug where `type` attribute was missing for netstat action in linux pack. Fixes #4946

Reported by @scguoi and contributed by Sheshagiri (@sheshagiri)

* Fixed a bug where persisting Orquesta to the MongoDB database returned an error
``message: key 'myvar.with.period' must not contain '.'``. This happened anytime an
``input``, ``output``, ``publish`` or context ``var`` contained a key with a ``.`` within
Expand Down
1 change: 1 addition & 0 deletions contrib/linux/actions/netstat.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,4 @@
args:
description: "Command line arguments"
default: " "
type: "string"
3 changes: 2 additions & 1 deletion contrib/linux/actions/netstat_grep.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,6 @@
immutable: true
default: "for pid in {{pids}}; do netstat -pant | grep $pid; done; exit 0"
pids:
description: "List of pids"
description: "List of pids. ex: [1111, 2222]"
required: true
type: "array"
4 changes: 2 additions & 2 deletions contrib/runners/orquesta_runner/orquesta_functions/st2kv.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ def st2kv_(context, key, **kwargs):
try:
user_db = auth_db_access.User.get(username)
except Exception as e:
raise Exception('Failed to retrieve User object for user "%s" % (username)' %
(six.text_type(e)))
raise Exception('Failed to retrieve User object for user "%s", "%s"' %
(username, six.text_type(e)))

has_default = 'default' in kwargs
default_value = kwargs.get('default')
Expand Down
2 changes: 1 addition & 1 deletion st2common/st2common/util/monkey_patch.py
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ def use_select_poll_workaround(nose_only=True):
import eventlet

# Work around to get tests to pass with eventlet >= 0.20.0
if not nose_only or (nose_only and'nose' in sys.modules.keys()):
if not nose_only or (nose_only and 'nose' in sys.modules.keys()):
# Add back blocking poll() to eventlet monkeypatched select
original_poll = eventlet.patcher.original('select').poll
select.poll = original_poll
Expand Down
2 changes: 1 addition & 1 deletion st2common/tests/unit/test_dist_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ class DistUtilsTestCase(unittest2.TestCase):
def setUp(self):
super(DistUtilsTestCase, self).setUp()

if 'pip'in sys.modules:
if 'pip' in sys.modules:
del sys.modules['pip']

def tearDown(self):
Expand Down