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
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -326,6 +326,9 @@ As of October 2022, there are still no signs of version control within the Splun
- [Search Head Backup](https://splunkbase.splunk.com/app/6438) - backup to an index, works in Splunk Cloud

## Release Notes
### 1.2.12
- Update as per github issue #28, python code update to splunkversioncontrol_utility.py for Splunk 9.3 compatability contributed by ParksBra

### 1.2.11
Library updates:
- Updated Splunk python SDK to 2.0.1
Expand Down
3 changes: 2 additions & 1 deletion bin/splunkversioncontrol_utility.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@ def runOSProcess(command, logger, timeout=60, shell=True):
finally:
timer.cancel()

if not timer.isAlive():
# As per https://github.com/gjanders/SplunkVersionControl/issues/28
if not getattr(timer, "isAlive", getattr(timer, "is_alive"))(): # Compatibility with >py3.8
res = False
logger.warn("OS process timed out after %s seconds, for command %s" % (timeout, command))
proc.terminate()
Expand Down
2 changes: 1 addition & 1 deletion default/app.conf
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ label = SplunkVersionControl
[launcher]
author = Gareth Anderson
description = Version Control software for Splunk instances (backup/restore from git)
version = 1.2.11
version = 1.2.12

[package]
id = SplunkVersionControl
Expand Down
Loading