tree 01e98e94d6334a667e54deb51288a3ca1faa8f7b
parent 5f28ea5e0386383ef2dd8839a5951f7e6ef09e94
parent 7eedadd0a08b15e8c8519863d6080d59580cf8de
author Steven Hung <sghung@ca.ibm.com> 1517587886 -0500
committer Gerrit Code Review @ Eclipse.org <gerrit@eclipse.org> 1517587886 -0500

Merge "Bug 530465 - make org.eclipse.wst.server_ui.feature REQUIRE org.eclipse.wst.server_core.feature instead of INCLUDING it, so we don't get two versions in the aggregate update site"