Skip to content

Commit 8f962f9

Browse files
basepibasepi
authored
Merge pull request #437 from hubblestack/develop
Merge to master (prep v2.4.1)
2 parents 4486e0f + daba1e0 commit 8f962f9

File tree

17 files changed

+24
-24
lines changed

17 files changed

+24
-24
lines changed

‎hubblestack/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = '2.4.0'
1+
__version__ = '2.4.1'

‎hubblestack/extmods/modules/nebula_osquery.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@ def _dict_update(dest, upd, recursive_update=True, merge_lists=False):
346346
dest_subkey = None
347347
if isinstance(dest_subkey, collections.Mapping) \
348348
and isinstance(val, collections.Mapping):
349-
ret = update(dest_subkey, val, merge_lists=merge_lists)
349+
ret = _dict_update(dest_subkey, val, merge_lists=merge_lists)
350350
dest[key] = ret
351351
elif isinstance(dest_subkey, list) \
352352
and isinstance(val, list):

‎hubblestack/extmods/modules/win_pulsar_winaudit.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -549,7 +549,7 @@ def _dict_update(dest, upd, recursive_update=True, merge_lists=False):
549549
dest_subkey = None
550550
if isinstance(dest_subkey, collections.Mapping) \
551551
and isinstance(val, collections.Mapping):
552-
ret = update(dest_subkey, val, merge_lists=merge_lists)
552+
ret = _dict_update(dest_subkey, val, merge_lists=merge_lists)
553553
dest[key] = ret
554554
elif isinstance(dest_subkey, list) \
555555
and isinstance(val, list):

‎pkg/amazonlinux2016.09/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,8 +125,8 @@ RUN yum install -y ruby ruby-devel rpmbuild rpm-build rubygems gcc make \
125125
#pyinstaller start
126126
#commands specified for ENTRYPOINT and CMD are executed when the container is run, not when the image is built
127127
#use the following variables to choose the version of hubble
128-
ENV HUBBLE_CHECKOUT=v2.4.0
129-
ENV HUBBLE_VERSION=2.4.0
128+
ENV HUBBLE_CHECKOUT=v2.4.1
129+
ENV HUBBLE_VERSION=2.4.1
130130
ENV HUBBLE_ITERATION=1
131131
ENV HUBBLE_GIT_URL=https://github.com/hubblestack/hubble.git
132132
ENV HUBBLE_SRC_PATH=/hubble_src

‎pkg/centos6/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,8 @@ RUN yum install -y rpmbuild rpm-build gcc make rh-ruby23 rh-ruby23-ruby-devel \
127127
#pyinstaller start
128128
#commands specified for ENTRYPOINT and CMD are executed when the container is run, not when the image is built
129129
#use the following variables to choose the version of hubble
130-
ENV HUBBLE_CHECKOUT=v2.4.0
131-
ENV HUBBLE_VERSION=2.4.0
130+
ENV HUBBLE_CHECKOUT=v2.4.1
131+
ENV HUBBLE_VERSION=2.4.1
132132
ENV HUBBLE_ITERATION=1
133133
ENV HUBBLE_GIT_URL=https://github.com/hubblestack/hubble.git
134134
ENV HUBBLE_SRC_PATH=/hubble_src

‎pkg/centos7/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,8 @@ RUN yum install -y ruby ruby-devel rpmbuild rpm-build rubygems gcc make \
124124
#pyinstaller start
125125
#commands specified for ENTRYPOINT and CMD are executed when the container is run, not when the image is built
126126
#use the following variables to choose the version of hubble
127-
ENV HUBBLE_CHECKOUT=v2.4.0
128-
ENV HUBBLE_VERSION=2.4.0
127+
ENV HUBBLE_CHECKOUT=v2.4.1
128+
ENV HUBBLE_VERSION=2.4.1
129129
ENV HUBBLE_ITERATION=1
130130
ENV HUBBLE_GIT_URL=https://github.com/hubblestack/hubble.git
131131
ENV HUBBLE_SRC_PATH=/hubble_src

‎pkg/coreos/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,9 +136,9 @@ RUN pip -v install -r pyinstaller-requirements.txt
136136
#pyinstaller start
137137
#commands specified for ENTRYPOINT and CMD are executed when the container is run, not when the image is built
138138
#use the following variables to choose the version of hubble
139-
ENV HUBBLE_CHECKOUT=v2.4.0
139+
ENV HUBBLE_CHECKOUT=v2.4.1
140140
ENV HUBBLE_GIT_URL=https://github.com/hubblestack/hubble.git
141-
ENV HUBBLE_VERSION=2.4.0
141+
ENV HUBBLE_VERSION=2.4.1
142142
ENV HUBBLE_ITERATION=1
143143
ENV HUBBLE_SRC_PATH=/hubble_src
144144
ENV _HOOK_DIR="./pkg/"

‎pkg/debian7/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,9 +163,9 @@ RUN apt-get install -y ruby ruby-dev rubygems gcc make \
163163
#pyinstaller start
164164
#commands specified for ENTRYPOINT and CMD are executed when the container is run, not when the image is built
165165
#use the following variables to choose the version of hubble
166-
ENV HUBBLE_CHECKOUT=v2.4.0
166+
ENV HUBBLE_CHECKOUT=v2.4.1
167167
ENV HUBBLE_GIT_URL=https://github.com/hubblestack/hubble.git
168-
ENV HUBBLE_VERSION=2.4.0
168+
ENV HUBBLE_VERSION=2.4.1
169169
ENV HUBBLE_ITERATION=1
170170
ENV HUBBLE_SRC_PATH=/hubble_src
171171
ENV _HOOK_DIR="./pkg/"

‎pkg/debian8/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,9 +145,9 @@ RUN apt-get install -y ruby ruby-dev rubygems gcc make \
145145
#pyinstaller start
146146
#commands specified for ENTRYPOINT and CMD are executed when the container is run, not when the image is built
147147
#use the following variables to choose the version of hubble
148-
ENV HUBBLE_CHECKOUT=v2.4.0
148+
ENV HUBBLE_CHECKOUT=v2.4.1
149149
ENV HUBBLE_GIT_URL=https://github.com/hubblestack/hubble.git
150-
ENV HUBBLE_VERSION=2.4.0
150+
ENV HUBBLE_VERSION=2.4.1
151151
ENV HUBBLE_ITERATION=1
152152
ENV HUBBLE_SRC_PATH=/hubble_src
153153
ENV _HOOK_DIR="./pkg/"

‎pkg/debian9/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,9 +140,9 @@ RUN apt-get install -y ruby ruby-dev rubygems gcc make \
140140
#pyinstaller start
141141
#commands specified for ENTRYPOINT and CMD are executed when the container is run, not when the image is built
142142
#use the following variables to choose the version of hubble
143-
ENV HUBBLE_CHECKOUT=v2.4.0
143+
ENV HUBBLE_CHECKOUT=v2.4.1
144144
ENV HUBBLE_GIT_URL=https://github.com/hubblestack/hubble.git
145-
ENV HUBBLE_VERSION=2.4.0
145+
ENV HUBBLE_VERSION=2.4.1
146146
ENV HUBBLE_ITERATION=1
147147
ENV HUBBLE_SRC_PATH=/hubble_src
148148
ENV _HOOK_DIR="./pkg/"

0 commit comments

Comments
 (0)