[Hyperic-hq-discuss] [hyperic/hqapi] 821f8a: Merge latest master to evolution

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

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

Commit: 821f8a0f69442f2513b9f4e8a9de3b0ade1edead
    http://github.com/hyperic/hqapi/commit/821f8a0f69442f2513b9f4e8a9de3b0ade1edead
Author: Jennifer Hickey <jen...@sp...>
Date:   2010-06-25 (Fri, 25 Jun 2010)

Changed paths:
  M ChangeLog
  M hqapi1-integration-tests/src/test/java/org/hyperic/hq/hqapi1/test/ControlAction_test.java
  M hqapi1-integration-tests/src/test/java/org/hyperic/hq/hqapi1/test/HQApiTestBase.java
  M hqapi1-integration-tests/src/test/java/org/hyperic/hq/hqapi1/test/ResourceGet_test.java
  M hqapi1-plugin/src/main/groovy/app/ControlController.groovy
  M hqapi1-plugin/src/main/groovy/app/ResourceController.groovy
  M hqapi1/src/main/java/org/hyperic/hq/hqapi1/ResourceApi.java
  M hqapi1/src/main/java/org/hyperic/hq/hqapi1/tools/MetricDataCommand.java
  M hqapi1/src/main/java/org/hyperic/hq/hqapi1/tools/Shell.java

Log Message:
-----------
Merge latest master to evolution