From 575472fa135e750eb4b1e24a37907bd77089c9bc Mon Sep 17 00:00:00 2001
From: Chandler <mew1033@users.noreply.github.com>
Date: Thu, 28 Sep 2017 15:18:10 -0600
Subject: [PATCH 1/2] Update nebula_osquery.py

---
 _modules/nebula_osquery.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/_modules/nebula_osquery.py b/_modules/nebula_osquery.py
index 375aed5..f456ac6 100644
--- a/_modules/nebula_osquery.py
+++ b/_modules/nebula_osquery.py
@@ -201,7 +201,7 @@ def queries(query_group,
         for query_name, query_ret in r.iteritems():
             for result in query_ret['data']:
                 for key, value in result.iteritems():
-                    if value and isinstance(value, str) and value.startswith('__JSONIFY__'):
+                    if value and isinstance(value, basestring) and value.startswith('__JSONIFY__'):
                         result[key] = json.loads(value[len('__JSONIFY__'):])
 
     return ret

From eb2784071824193a13ed2a22dcd94489990a51eb Mon Sep 17 00:00:00 2001
From: Colton Myers <colton.myers@gmail.com>
Date: Thu, 28 Sep 2017 15:22:29 -0600
Subject: [PATCH 2/2] Rev to v2017.9.2

---
 README.md                           | 2 +-
 _beacons/pulsar.py                  | 2 +-
 _modules/hubble.py                  | 2 +-
 _modules/nebula_osquery.py          | 2 +-
 _modules/win_pulsar.py              | 2 +-
 _returners/slack_pulsar_returner.py | 2 +-
 _returners/splunk_nebula_return.py  | 2 +-
 _returners/splunk_nova_return.py    | 2 +-
 _returners/splunk_pulsar_return.py  | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index b774262..42d3ee9 100644
--- a/README.md
+++ b/README.md
@@ -68,7 +68,7 @@ gitfs_remotes:
   - https://github.com/hubblestack/hubblestack_data.git:
     - root: ''
   - https://github.com/hubblestack/hubble-salt.git:
-    - base: v2017.9.1
+    - base: v2017.9.2
     - root: ''
 ```
 
diff --git a/_beacons/pulsar.py b/_beacons/pulsar.py
index bccb6b3..614eafc 100644
--- a/_beacons/pulsar.py
+++ b/_beacons/pulsar.py
@@ -39,7 +39,7 @@
     DEFAULT_MASK = None
 
 __virtualname__ = 'pulsar'
-__version__ = 'v2017.9.1'
+__version__ = 'v2017.9.2'
 CONFIG = None
 CONFIG_STALENESS = 0
 
diff --git a/_modules/hubble.py b/_modules/hubble.py
index 1163e00..e9fe578 100644
--- a/_modules/hubble.py
+++ b/_modules/hubble.py
@@ -35,7 +35,7 @@
 from nova_loader import NovaLazyLoader
 
 __nova__ = {}
-__version__ = 'v2017.9.1'
+__version__ = 'v2017.9.2'
 
 
 def audit(configs=None,
diff --git a/_modules/nebula_osquery.py b/_modules/nebula_osquery.py
index f456ac6..a0e3ad5 100644
--- a/_modules/nebula_osquery.py
+++ b/_modules/nebula_osquery.py
@@ -41,7 +41,7 @@
 
 log = logging.getLogger(__name__)
 
-__version__ = 'v2017.9.1'
+__version__ = 'v2017.9.2'
 __virtualname__ = 'nebula'
 
 
diff --git a/_modules/win_pulsar.py b/_modules/win_pulsar.py
index aed6f72..d2f30f0 100644
--- a/_modules/win_pulsar.py
+++ b/_modules/win_pulsar.py
@@ -28,7 +28,7 @@
 CONFIG = None
 CONFIG_STALENESS = 0
 
-__version__ = 'v2017.9.1'
+__version__ = 'v2017.9.2'
 
 
 def __virtual__():
diff --git a/_returners/slack_pulsar_returner.py b/_returners/slack_pulsar_returner.py
index c76c895..a3fdba8 100644
--- a/_returners/slack_pulsar_returner.py
+++ b/_returners/slack_pulsar_returner.py
@@ -69,7 +69,7 @@
 # Import Salt Libs
 import salt.returners
 
-__version__ = 'v2017.9.1'
+__version__ = 'v2017.9.2'
 
 log = logging.getLogger(__name__)
 
diff --git a/_returners/splunk_nebula_return.py b/_returners/splunk_nebula_return.py
index aad4a2c..6c6bd6d 100644
--- a/_returners/splunk_nebula_return.py
+++ b/_returners/splunk_nebula_return.py
@@ -50,7 +50,7 @@
 
 import logging
 
-__version__ = 'v2017.9.1'
+__version__ = 'v2017.9.2'
 
 _max_content_bytes = 100000
 http_event_collector_SSL_verify = False
diff --git a/_returners/splunk_nova_return.py b/_returners/splunk_nova_return.py
index e7f1298..f457429 100644
--- a/_returners/splunk_nova_return.py
+++ b/_returners/splunk_nova_return.py
@@ -49,7 +49,7 @@
 
 import logging
 
-__version__ = 'v2017.9.1'
+__version__ = 'v2017.9.2'
 
 _max_content_bytes = 100000
 http_event_collector_SSL_verify = False
diff --git a/_returners/splunk_pulsar_return.py b/_returners/splunk_pulsar_return.py
index d37e8fd..ad0b0b5 100644
--- a/_returners/splunk_pulsar_return.py
+++ b/_returners/splunk_pulsar_return.py
@@ -51,7 +51,7 @@
 
 import logging
 
-__version__ = 'v2017.9.1'
+__version__ = 'v2017.9.2'
 
 _max_content_bytes = 100000
 http_event_collector_SSL_verify = False