[BZ 1098561] Parse delete-only option from the command line
Merge pull request #71 from burmanm/1098561

Fix BZ1098561
[1094424] "Reindex Data Tables Nightly" setting can cause agents to time out during reindex
This is follow-up work to PR45.  Add setting the nightly re-index option
to false in db-upgrade.  Also, remove unused numeric data tables from
being processed if in fact the option is set to true.

This whole option should probably go away, see the discussion in the
PR.
[JBoss AS7] add read-write config update delegate which reads resource config prior applying update and applies changes only (currently supports only simple properties
[Bug 1080833]

For EJB3 subsystem we now apply only configuration properties that differ
from current configuration.
[1108833] Enabling LDAP on one JBoss ON Server in HA Configuration is not propagated to another server(s) until their restart so the users cannot log in
Enable/Disable of LDAP requires a system reconfigure (reinstall the JAAS
login modules...). Change things such that the system reconfigure gets
performed whenever HA nodes detect a change in system settings. So,
this fix is a bit more general that the specific case listed here.  The
system settings update check is every 60s, so HA nodes should pick up
a change within a minute.
Revert "BZ 1091128 - Support for object name partial matching like :name=IPCLogger-%a%"

This reverts commit d7ec3fab9bc5139fb3c1f80805014ef082ad63f8.

This commit had unforseen side effects.
Add support for IncludeOptional directive added in httpd 2.3.6.

This seems to be used by default on newer systems (at least Fedora 20
has it) causing the apache plugin to not discover large parts of
httpd inventory subtree.
Merged pull request #58 from metlos/feature/support-IncludeOptional-in-apache-plugin

Add support for IncludeOptional directive added in httpd 2.3.6.
Merge branch 'master' of git://github.com/rhq-project/rhq into patternflyTheme

merge master
[BZ 1022009] - response times not shown for managed deployment

Fixed the way we resolve server log dir in case the deployment is on managed
server
[1105892] Metric base unit in alert definition is incorrect resulting in bad absolute metric threshold evaluation
- fix issue where MeasurementUnits object was used where its String form was needed
- fix issues with keeping the units paired correctly with the selected
  metric, and ensure the first list entry is always the default.
- simplified the widget initialization (although this was not a primary issue)
Merge branch 'master' of github.com:rhq-project/rhq
Bump ems version to 1.3.6-rhq to address two bugs in 1.3.5-rhq.
BZ 1115815 - explicitly set the from address for alert emails to what is given in rhq-server.properties.
pattern fly updates

StorageNode configuration
backbutton
other changes noted by UX team
Adding Michael (Yak) to rhq irc bot so that !jon-team command could ping him
Bug 1116000 - Error creating "Local Disk Storage Content Source"

Database property retriever needs to be registered at startup with PropertyRenderingUtility#putDynamicPropertyRetriever

This setup code snippet was lost during AS7 rebasing for RHQ4.6
Merge branch 'patternflyTheme' of https://github.com/alns/rhq into patternflyTheme

Conflicts:
	modules/enterprise/gui/coregui/src/main/webapp/org.rhq.coregui.CoreGUI/sc/skins/CoreGUI/skin_styles.css

	modified:   org.rhq.coregui.CoreGUI/sc/skins/CoreGUI/skin_styles.css
Merge branch 'master' of git://github.com/rhq-project/rhq into patternflyTheme

merge