Skip to content

Commit

Permalink
Merge branch 'master' into forPython3
Browse files Browse the repository at this point in the history
  • Loading branch information
n27051538 authored Feb 8, 2022
2 parents 8b12baf + 4dd65b4 commit ec36adf
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Also work on x86 platform, community-tested with Openindiana (x86) (OI-hipster-m
- 2021 Jan 05. Added TextFileCollector, SVCSCollector now enabled for all zones (Thanks to Marcel Peter)
- 2021 Mar 01. [Fixed](https://github.com/n27051538/solaris_exporter/issues/4) psutil version to 5.7.0 (something changed in the newer versions, have to time to look at)
- 2022 Jan 24. Added support for Python 3. In testing.
- 2022 Feb 04. Documentation update for support of Solaris 11.4.41. In testing.
- 2022 Feb 04. Documentation update for support of Solaris 11.4.41.
- 2022 Feb 05. [Fixed](https://github.com/n27051538/solaris_exporter/issues/7) support of Python 2.7 for Solaris 11.4.41.

## Provides info about:
Expand Down
2 changes: 1 addition & 1 deletion solaris_exporter.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
2022 Jan 24. Added support for Python 3.7. In testing.
2022 Feb 04. Documentation update for support of Solaris 11.4.41. In testing.
2022 Feb 05. Fixed support of Python 2.7 for Solaris 11.4.41
(https://github.com/n27051538/solaris_exporter/issues/7). Tests completed.
(https://github.com/n27051538/solaris_exporter/issues/7).
Written by Alexander Golikov for collecting SPARC Solaris metrics for Prometheus.
Expand Down

0 comments on commit ec36adf

Please sign in to comment.