[Hyperic-hq-discuss] [hyperic/hqapi] edc915: Merge latest master

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

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

Commit: edc915a462cc9151e53c08cbc7a77e5068ff3794
    http://github.com/hyperic/hqapi/commit/edc915a462cc9151e53c08cbc7a77e5068ff3794
Author: Jennifer Hickey <jen...@sp...>
Date:   2010-08-03 (Tue, 03 Aug 2010)

Changed paths:
  M ChangeLog
  M hqapi1-integration-tests/src/test/java/org/hyperic/hq/hqapi1/test/ResourceFind_test.java
  M hqapi1-integration-tests/src/test/java/org/hyperic/hq/hqapi1/test/ResourceGet_test.java
  M hqapi1-integration-tests/src/test/java/org/hyperic/hq/hqapi1/test/ServerConfigSet_test.java
  M hqapi1-plugin/src/main/groovy/app/AlertController.groovy
  M hqapi1-plugin/src/main/groovy/app/AlertdefinitionController.groovy
  M hqapi1-plugin/src/main/groovy/app/ApiController.groovy
  M hqapi1-plugin/src/main/groovy/app/ControlController.groovy
  M hqapi1-plugin/src/main/groovy/app/GroupController.groovy
  M hqapi1-plugin/src/main/groovy/app/MetricController.groovy
  M hqapi1-plugin/src/main/groovy/app/ResourceController.groovy
  M hqapi1-plugin/src/main/groovy/app/ServerconfigController.groovy
  M hqapi1/src/main/java/org/hyperic/hq/hqapi1/ResourceApi.java
  M hqapi1/src/main/java/org/hyperic/hq/hqapi1/tools/AlertCommand.java
  M hqapi1/src/main/java/org/hyperic/hq/hqapi1/tools/GroupCommand.java
  M hqapi1/src/main/java/org/hyperic/hq/hqapi1/tools/ResourceCommand.java

Log Message:
-----------
Merge latest master


Commit: 09a71fe38f0baf5423fac84b835692cb00819556
    http://github.com/hyperic/hqapi/commit/09a71fe38f0baf5423fac84b835692cb00819556
Author: Jennifer Hickey <jen...@sp...>
Date:   2010-08-03 (Tue, 03 Aug 2010)

Changed paths:
  M hqapi1-integration-tests/pom.xml

Log Message:
-----------
Fixed version of integration tests