Skip to content

Commit b880157

Browse files
committed
Merge branch 'master' of https://github.com/RuntimeTools/appmetrics into headless
2 parents 70e33c1 + 69eaa6e commit b880157

File tree

4 files changed

+6
-5
lines changed

4 files changed

+6
-5
lines changed

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -477,9 +477,10 @@ The npm package for this project uses a semver-parsable X.0.Z version number for
477477
Non-release versions of this project (for example on github.com/RuntimeTools/appmetrics) will use semver-parsable X.0.Z-dev.B version numbers, where X.0.Z is the last release with Z incremented and B is an integer. For further information on the development process go to the [appmetrics wiki][3]: [Developing](https://github.com/RuntimeTools/appmetrics/wiki/Developing).
478478

479479
## Version
480-
2.0 development
480+
1.2.0
481481

482482
## Release History
483+
`1.2.0` - Add headless data collection capability and option configuration via api.
483484
`1.1.2` - Update agent core to 3.0.10, support Node.js v7.
484485
`1.1.1` - Fix node-gyp rebuild failure and don't force MQTT broker to on
485486
`1.1.0` - Bug fixes, improved MongoDB data, updated dependencies, CPU watchdog feature

extract_all_binaries.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ var AGENTCORE_PLATFORMS = ['aix-ppc',
3838
'linux-x64',
3939
'win32-ia32',
4040
'win32-x64'];
41-
var AGENTCORE_VERSION = "3.0.10";
42-
var APPMETRICS_VERSION = "1.1.3";
41+
var AGENTCORE_VERSION = "3.1.0";
42+
var APPMETRICS_VERSION = "1.2.0";
4343

4444
var LOG_FILE = path.join(INSTALL_DIR, 'install.log');
4545
var logFileStream = fs.createWriteStream(LOG_FILE, {flags : 'a'});

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "appmetrics",
3-
"version": "1.1.3",
3+
"version": "1.2.0",
44
"description": "Node Application Metrics",
55
"bin": {
66
"node-hc": "bin/appmetrics-cli.js"

0 commit comments

Comments
 (0)