[29/50] [abbrv] incubator-netbeans git commit: Merge branch 'pr/78'

[jlahoda]

Merge branch 'pr/78'


Project: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/commit/c18b28ed
Tree: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/tree/c18b28ed
Diff: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/diff/c18b28ed

Branch: refs/heads/jdk-javac
Commit: c18b28ed9b4d539a8e7389aeaecf9844d7b0da51
Parents: 39bc874 8b05939
Author: Matthias Bläsing <mblaes...@doppel-helix.eu>
Authored: Sat Oct 7 17:38:35 2017 +0200
Committer: Matthias Bläsing <mblaes...@doppel-helix.eu>
Committed: Sat Oct 7 17:38:35 2017 +0200

----------------------------------------------------------------------
 .../api/autoupdate/data/updates-subset.xml      | 20 ++++++++
 .../netbeans/api/autoupdate/data/updates.xml    | 20 ++++++++
 .../autoupdate/updateprovider/data/catalog.xml  | 21 +++++++-
 .../autoupdate/updateprovider/malformed.xml     | 20 ++++++++
 .../netbeans/updater/UpdateTrackingTest.java    | 53 ++++++--------------
 5 files changed, 95 insertions(+), 39 deletions(-)
----------------------------------------------------------------------