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 fd0c216

Browse files
author
Jim Olsen
committed
merge develop branch for release 2.1.6
2 parents 6985955 + e58cbde commit fd0c216

File tree

97 files changed

+1724
-1397
lines changed

Some content is hidden

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

97 files changed

+1724
-1397
lines changed

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

+9-3
Original file line numberDiff line numberDiff line change
@@ -787,7 +787,9 @@ <h1>
787787
[--debug_method_locals] [--record_all_requests]
788788
[--stats_loop_enabled] [--http_auth_retry]
789789
[--http_retry_count HTTP_RETRY_COUNT]
790-
[--pytan_user_config PYTAN_USER_CONFIG] -i ID
790+
[--pytan_user_config PYTAN_USER_CONFIG]
791+
[--force_server_version FORCE_SERVER_VERSION]
792+
-i ID
791793

792794
Approve a saved action by ID
793795

@@ -827,6 +829,10 @@ <h1>
827829
--pytan_user_config PYTAN_USER_CONFIG
828830
PyTan User Config file to use for PyTan arguments
829831
(defaults to: ~/.pytan_config.json) (default: )
832+
--force_server_version FORCE_SERVER_VERSION
833+
Force PyTan to consider the server version as this,
834+
instead of relying on the server version derived from
835+
the server info page. (default: )
830836

831837
Approve Saved Action Options:
832838
-i ID, --id ID ID of Saved Action to approve (default: None)
@@ -865,7 +871,7 @@ <h1>
865871

866872
<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>
867873

868-
<pre><code>PyTan v2.1.5 Handler for Session to 10.0.1.240:443, Authenticated: True, Platform Version: 6.5.314.4301
874+
<pre><code>PyTan v2.1.6 Handler for Session to 10.0.1.240:443, Authenticated: True, Platform Version: 6.5.314.4301
869875
++ Saved Action ID approved successfully: 1
870876
</code></pre>
871877

@@ -893,7 +899,7 @@ <h1>
893899
<p><a href="#user-content-toc">TOC</a></p>
894900

895901
<h6>
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>
902+
<a id="user-content-generated-by-build_bin_doc-v210-date-fri-oct--2-160307-2015-edt-contact-info-jim-olsen-jimolsentaniumcom" class="anchor" href="#generated-by-build_bin_doc-v210-date-fri-oct--2-160307-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: Fri Oct 2 16:03:07 2015 EDT, Contact info: <strong>Jim Olsen <a href="mailto:[email protected]">[email protected]</a></strong>
897903
</h6>
898904

899905
</body></html>

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

+9-3
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,9 @@ usage: approve_saved_action.py [-h] [-u USERNAME] [-p PASSWORD]
2828
[--debug_method_locals] [--record_all_requests]
2929
[--stats_loop_enabled] [--http_auth_retry]
3030
[--http_retry_count HTTP_RETRY_COUNT]
31-
[--pytan_user_config PYTAN_USER_CONFIG] -i ID
31+
[--pytan_user_config PYTAN_USER_CONFIG]
32+
[--force_server_version FORCE_SERVER_VERSION]
33+
-i ID
3234
3335
Approve a saved action by ID
3436
@@ -68,6 +70,10 @@ Handler Options:
6870
--pytan_user_config PYTAN_USER_CONFIG
6971
PyTan User Config file to use for PyTan arguments
7072
(defaults to: ~/.pytan_config.json) (default: )
73+
--force_server_version FORCE_SERVER_VERSION
74+
Force PyTan to consider the server version as this,
75+
instead of relying on the server version derived from
76+
the server info page. (default: )
7177
7278
Approve Saved Action Options:
7379
-i ID, --id ID ID of Saved Action to approve (default: None)
@@ -96,7 +102,7 @@ bin/approve_saved_action.py -u Administrator -p 'Tanium2015!' --host 10.0.1.240
96102
```
97103

98104
```
99-
PyTan v2.1.5 Handler for Session to 10.0.1.240:443, Authenticated: True, Platform Version: 6.5.314.4301
105+
PyTan v2.1.6 Handler for Session to 10.0.1.240:443, Authenticated: True, Platform Version: 6.5.314.4301
100106
++ Saved Action ID approved successfully: 1
101107
```
102108

@@ -113,4 +119,4 @@ PyTan v2.1.5 Handler for Session to 10.0.1.240:443, Authenticated: True, Platfor
113119
[TOC](#user-content-toc)
114120

115121

116-
###### generated by: `build_bin_doc v2.1.0`, date: Tue Sep 15 18:20:10 2015 EDT, Contact info: **Jim Olsen <[email protected]>**
122+
###### generated by: `build_bin_doc v2.1.0`, date: Fri Oct 2 16:03:07 2015 EDT, Contact info: **Jim Olsen <[email protected]>**

0 commit comments

Comments
 (0)