Branch: refs/heads/master
Home: http://github.com/hyperic/hqapi
Commit: b417716eb5db4805de6ffb3b9f94b676562357a6
http://github.com/hyperic/hqapi/commit/b417716eb5db4805de6ffb3b9f94b676562357a6
Author: Ryan Morgan <rm...@hy...>
Date: 2010-03-08 (Mon, 08 Mar 2010)
Changed paths:
M ChangeLog
M hqu/hqapi1/app/AlertdefinitionController.groovy
M src/org/hyperic/hq/hqapi1/AlertDefinitionApi.java
A src/org/hyperic/hq/hqapi1/test/AlertDefinitionGetByResource_test.java
M src/org/hyperic/hq/hqapi1/tools/AlertDefinitionCommand.java
M xsd/HQApi1.wadl
Log Message:
-----------
[HHQ-3231,HHQ-3786] Allow alert definitions to be listed by platform.
Commit: 172d9afa897ffcdfa2f1de6483f496d17a6bc237
http://github.com/hyperic/hqapi/commit/172d9afa897ffcdfa2f1de6483f496d17a6bc237
Author: Ryan Morgan <rm...@hy...>
Date: 2010-03-08 (Mon, 08 Mar 2010)
Changed paths:
M ChangeLog
M hqu/hqapi1/app/AlertdefinitionController.groovy
M src/org/hyperic/hq/hqapi1/AlertDefinitionApi.java
A src/org/hyperic/hq/hqapi1/test/AlertDefinitionGetByResource_test.java
M src/org/hyperic/hq/hqapi1/tools/AlertDefinitionCommand.java
M xsd/HQApi1.wadl
Log Message:
-----------
Fix merge confict.
|
