Merge pull request #64 from hubblestack/develop

Merge to master (prep v2017.4.1)
hubblestack · Apr 3, 2017 · 18a01f5 · 18a01f5
2 parents 1f88cfe + b5cb930
commit 18a01f5
Show file tree

Hide file tree

Showing 11 changed files with 579 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -23,7 +23,7 @@ fileserver_backend:
   - git
 gitfs_remotes:
   - https://github.com/hubblestack/hubble-salt.git:
-    - base: v2017.3.2
+    - base: v2017.4.1
     - root: ''
 ```
 

diff --git a/_beacons/pulsar.py b/_beacons/pulsar.py
@@ -39,7 +39,7 @@
     DEFAULT_MASK = None
 
 __virtualname__ = 'pulsar'
-__version__ = 'v2017.3.2'
+__version__ = 'v2017.4.1'
 CONFIG = None
 CONFIG_STALENESS = 0
 
@@ -50,7 +50,7 @@
 def __virtual__():
     if salt.utils.is_windows():
         return False, 'This module only works on Linux'
-    return False
+    return True
 
 
 def _get_mask(mask):

diff --git a/_beacons/win_pulsar.py b/_beacons/win_pulsar.py
@@ -26,7 +26,7 @@
 DEFAULT_TYPE = 'all'
 
 __virtualname__ = 'pulsar'
-__version__ = 'v2017.3.2'
+__version__ = 'v2017.4.1'
 CONFIG = None
 CONFIG_STALENESS = 0
 

diff --git a/_modules/hubble.py b/_modules/hubble.py
@@ -35,7 +35,7 @@
 from salt.loader import LazyLoader
 
 __nova__ = {}
-__version__ = 'v2017.3.2'
+__version__ = 'v2017.4.1'
 
 
 def audit(configs=None,

diff --git a/_modules/nebula_osquery.py b/_modules/nebula_osquery.py
@@ -40,7 +40,7 @@
 
 log = logging.getLogger(__name__)
 
-__version__ = 'v2017.3.2'
+__version__ = 'v2017.4.1'
 __virtualname__ = 'nebula'