Branch: refs/heads/master
Home: http://github.com/hyperic/hqapi
Commit: 53a09c31d0d2fd49b9134eca33cabd83a0efd09e
http://github.com/hyperic/hqapi/commit/53a09c31d0d2fd49b9134eca33cabd83a0efd09e
Author: Ryan Morgan <rm...@hy...>
Date: 2010-08-03 (Tue, 03 Aug 2010)
Changed paths:
M ChangeLog
M hqu/hqapi1/app/AlertdefinitionController.groovy
M src/org/hyperic/hq/hqapi1/AlertDefinitionBuilder.java
A src/org/hyperic/hq/hqapi1/test/AlertDefinitionSyncEmailAction_test.java
M src/org/hyperic/hq/hqapi1/tools/AlertDefinitionCommand.java
Log Message:
-----------
[HHQ-4175] Add EmailAction support for alert definitions.
Commit: 2c7901e6c0bf48bb437a4280c0be35d63bbe707e
http://github.com/hyperic/hqapi/commit/2c7901e6c0bf48bb437a4280c0be35d63bbe707e
Author: Ryan Morgan <rm...@hy...>
Date: 2010-08-03 (Tue, 03 Aug 2010)
Changed paths:
M ChangeLog
M hqu/hqapi1/app/AlertdefinitionController.groovy
M src/org/hyperic/hq/hqapi1/AlertDefinitionBuilder.java
A src/org/hyperic/hq/hqapi1/test/AlertDefinitionSyncEmailAction_test.java
M src/org/hyperic/hq/hqapi1/tools/AlertDefinitionCommand.java
Log Message:
-----------
Fix merge conflicts.
|
