Skip to content

Commit

Permalink
Merge pull request #119 from Pourliver/fix_default
Browse files Browse the repository at this point in the history
Removed APM from default chocolatey packages
  • Loading branch information
obilodeau committed Jul 17, 2019
2 parents 33e8940 + ccd3f57 commit 6c7397d
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 2 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ For a detailed view of what has changed, refer to the {uri-repo}/commits/master[

== <next release>

Bug fixes::
* Removed APM from default chocolatey packages ({uri-issue}119[#119])

Infrastructure Improvements::
* Further improvements to Jenkins CI system fixed Windows 7 build issues ({uri-issue}108[#108], {uri-issue}110[#110])

Expand Down
2 changes: 1 addition & 1 deletion malboxes/config-example.js
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
// Chocolatey packages to install on the VM
// TODO re-add dependencywalker and regshot once upstream choco package provides a checksum
// TODO: Re-add processhacker when its fixed for win7_64
"choco_packages": "sysinternals windbg 7zip putty apm wireshark winpcap",
"choco_packages": "sysinternals windbg 7zip putty wireshark winpcap",

// Setting the IDA Path will copy the IDA remote debugging tools into the guest
//"ida_path": "/path/to/your/ida",
Expand Down
2 changes: 1 addition & 1 deletion tests/smoke/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@

// Chocolatey packages to install on the VM
// FIXME made install go faster to prevent jenkins / packer bug when building Windows 7 machines (see #108)
//"choco_packages": "sysinternals windbg wireshark 7zip putty apm",
//"choco_packages": "sysinternals windbg wireshark 7zip putty",

// Setting the IDA Path will copy the IDA remote debugging tools into the guest
//"ida_path": "/path/to/your/ida",
Expand Down

0 comments on commit 6c7397d

Please sign in to comment.