[Hyperic-hq-discuss] [hyperic/hqapi] d54fd1: [HPM-112] Fix find by resource description

[<no...@gi...>]

Branch: refs/heads/master
Home:   http://github.com/hyperic/hqapi

Commit: d54fd1d85417c076838fe731a6a7f1e71e83feef
    http://github.com/hyperic/hqapi/commit/d54fd1d85417c076838fe731a6a7f1e71e83feef
Author: Ryan Morgan <rm...@hy...>
Date:   2010-07-08 (Thu, 08 Jul 2010)

Changed paths:
  M hqu/hqapi1/app/AlertdefinitionController.groovy

Log Message:
-----------
[HPM-112] Fix find by resource description


Commit: e0651ae4fed18cb10ac82f1a61e08bdfcc216d2d
    http://github.com/hyperic/hqapi/commit/e0651ae4fed18cb10ac82f1a61e08bdfcc216d2d
Author: Ryan Morgan <rm...@hy...>
Date:   2010-07-08 (Thu, 08 Jul 2010)

Changed paths:
  M hqu/hqapi1/app/AlertController.groovy
  M hqu/hqapi1/app/GroupController.groovy
  M hqu/hqapi1/app/MetricController.groovy

Log Message:
-----------
Account for getResource() possibly throwing PermissionException


Commit: 1a9ca74f05a528f573b0d4ec126550c2036a6b0f
    http://github.com/hyperic/hqapi/commit/1a9ca74f05a528f573b0d4ec126550c2036a6b0f
Author: Ryan Morgan <rm...@hy...>
Date:   2010-07-08 (Thu, 08 Jul 2010)

Changed paths:
  M ChangeLog
  M hqu/hqapi1/app/AlertController.groovy
  M hqu/hqapi1/app/AlertdefinitionController.groovy
  M hqu/hqapi1/app/ApiController.groovy
  M hqu/hqapi1/app/GroupController.groovy
  M hqu/hqapi1/app/MetricController.groovy
  M hqu/hqapi1/app/ResourceController.groovy
  M src/org/hyperic/hq/hqapi1/test/ResourceFind_test.java
  M src/org/hyperic/hq/hqapi1/test/ResourceGet_test.java

Log Message:
-----------
Fix merge conflicts.


Commit: 487e22203e9ae7b5bb919fa8db71199dcf2b07c0
    http://github.com/hyperic/hqapi/commit/487e22203e9ae7b5bb919fa8db71199dcf2b07c0
Author: Ryan Morgan <rm...@hy...>
Date:   2010-07-08 (Thu, 08 Jul 2010)

Changed paths:
  M hqu/hqapi1/app/ApiController.groovy

Log Message:
-----------
Skip permission checking on individual groups, not supported in HQU.


Commit: 4d3e3c41e1fcf0e639bbbbc3ea1a6c45f934bea7
    http://github.com/hyperic/hqapi/commit/4d3e3c41e1fcf0e639bbbbc3ea1a6c45f934bea7
Author: Ryan Morgan <rm...@hy...>
Date:   2010-07-08 (Thu, 08 Jul 2010)

Changed paths:
  M hqu/hqapi1/app/AlertdefinitionController.groovy
  M hqu/hqapi1/app/ControlController.groovy

Log Message:
-----------
Adjustments for error codes to get tests passing.