Skip to content
This repository was archived by the owner on Nov 21, 2019. It is now read-only.
This repository is currently being migrated. It's locked while the migration is in progress.

Commit 6985955

Browse files
author
Jim Olsen
committed
merge develop branch for release 2.1.5
2 parents df74401 + 395502b commit 6985955

File tree

148 files changed

+3315
-1056
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

148 files changed

+3315
-1056
lines changed

‎BUILD/build_api_examples.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -428,6 +428,6 @@ def main(self, skip_files=[], all_json_files=None, clean=True):
428428
if __name__ == '__main__':
429429
skip_files = ['ddt_invalid_connects.json']
430430

431-
ep = ExampleProcesser(verbose=False, tempdir=True)
431+
ep = ExampleProcesser(verbose=False, tempdir=False)
432432
ep.main(skip_files=skip_files, clean=True)
433433
console = pytan.binsupport.HistoryConsole()

‎BUILD/doc/source/_static/bin_doc/approve_saved_action.html

+7-3
Original file line numberDiff line numberDiff line change
@@ -786,7 +786,8 @@ <h1>
786786
[--port PORT] [-l LOGLEVEL] [--debugformat]
787787
[--debug_method_locals] [--record_all_requests]
788788
[--stats_loop_enabled] [--http_auth_retry]
789-
[--http_retry_count HTTP_RETRY_COUNT] -i ID
789+
[--http_retry_count HTTP_RETRY_COUNT]
790+
[--pytan_user_config PYTAN_USER_CONFIG] -i ID
790791

791792
Approve a saved action by ID
792793

@@ -823,6 +824,9 @@ <h1>
823824
--http_retry_count HTTP_RETRY_COUNT
824825
Retry count for HTTP failures/invalid responses
825826
(default: 5)
827+
--pytan_user_config PYTAN_USER_CONFIG
828+
PyTan User Config file to use for PyTan arguments
829+
(defaults to: ~/.pytan_config.json) (default: )
826830

827831
Approve Saved Action Options:
828832
-i ID, --id ID ID of Saved Action to approve (default: None)
@@ -861,7 +865,7 @@ <h1>
861865

862866
<div class="highlight highlight-source-shell"><pre>bin/approve_saved_action.py -u Administrator -p <span class="pl-s"><span class="pl-pds">'</span>Tanium2015!<span class="pl-pds">'</span></span> --host 10.0.1.240 --port 443 --loglevel 1 --id 1</pre></div>
863867

864-
<pre><code>PyTan v2.1.4 Handler for Session to 10.0.1.240:443, Authenticated: True, Platform Version: 6.5.314.4301
868+
<pre><code>PyTan v2.1.5 Handler for Session to 10.0.1.240:443, Authenticated: True, Platform Version: 6.5.314.4301
865869
++ Saved Action ID approved successfully: 1
866870
</code></pre>
867871

@@ -889,7 +893,7 @@ <h1>
889893
<p><a href="#user-content-toc">TOC</a></p>
890894

891895
<h6>
892-
<a id="user-content-generated-by-build_bin_doc-v210-date-mon-sep-14-154805-2015-edt-contact-info-jim-olsen-jimolsentaniumcom" class="anchor" href="#generated-by-build_bin_doc-v210-date-mon-sep-14-154805-2015-edt-contact-info-jim-olsen-jimolsentaniumcom" aria-hidden="true"><span class="octicon octicon-link"></span></a>generated by: <code>build_bin_doc v2.1.0</code>, date: Mon Sep 14 15:48:05 2015 EDT, Contact info: <strong>Jim Olsen <a href="mailto:[email protected]">[email protected]</a></strong>
896+
<a id="user-content-generated-by-build_bin_doc-v210-date-tue-sep-15-182010-2015-edt-contact-info-jim-olsen-jimolsentaniumcom" class="anchor" href="#generated-by-build_bin_doc-v210-date-tue-sep-15-182010-2015-edt-contact-info-jim-olsen-jimolsentaniumcom" aria-hidden="true"><span class="octicon octicon-link"></span></a>generated by: <code>build_bin_doc v2.1.0</code>, date: Tue Sep 15 18:20:10 2015 EDT, Contact info: <strong>Jim Olsen <a href="mailto:[email protected]">[email protected]</a></strong>
893897
</h6>
894898

895899
</body></html>

‎BUILD/doc/source/_static/bin_doc/approve_saved_action.md

+7-3
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ usage: approve_saved_action.py [-h] [-u USERNAME] [-p PASSWORD]
2727
[--port PORT] [-l LOGLEVEL] [--debugformat]
2828
[--debug_method_locals] [--record_all_requests]
2929
[--stats_loop_enabled] [--http_auth_retry]
30-
[--http_retry_count HTTP_RETRY_COUNT] -i ID
30+
[--http_retry_count HTTP_RETRY_COUNT]
31+
[--pytan_user_config PYTAN_USER_CONFIG] -i ID
3132
3233
Approve a saved action by ID
3334
@@ -64,6 +65,9 @@ Handler Options:
6465
--http_retry_count HTTP_RETRY_COUNT
6566
Retry count for HTTP failures/invalid responses
6667
(default: 5)
68+
--pytan_user_config PYTAN_USER_CONFIG
69+
PyTan User Config file to use for PyTan arguments
70+
(defaults to: ~/.pytan_config.json) (default: )
6771
6872
Approve Saved Action Options:
6973
-i ID, --id ID ID of Saved Action to approve (default: None)
@@ -92,7 +96,7 @@ bin/approve_saved_action.py -u Administrator -p 'Tanium2015!' --host 10.0.1.240
9296
```
9397

9498
```
95-
PyTan v2.1.4 Handler for Session to 10.0.1.240:443, Authenticated: True, Platform Version: 6.5.314.4301
99+
PyTan v2.1.5 Handler for Session to 10.0.1.240:443, Authenticated: True, Platform Version: 6.5.314.4301
96100
++ Saved Action ID approved successfully: 1
97101
```
98102

@@ -109,4 +113,4 @@ PyTan v2.1.4 Handler for Session to 10.0.1.240:443, Authenticated: True, Platfor
109113
[TOC](#user-content-toc)
110114

111115

112-
###### generated by: `build_bin_doc v2.1.0`, date: Mon Sep 14 15:48:05 2015 EDT, Contact info: **Jim Olsen <[email protected]>**
116+
###### generated by: `build_bin_doc v2.1.0`, date: Tue Sep 15 18:20:10 2015 EDT, Contact info: **Jim Olsen <[email protected]>**

0 commit comments

Comments
 (0)