[Hyperic-hq-discuss] [hyperic/hqapi] 58891a: Backport fix for handling of multiple query parame...

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

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

Commit: 58891a7c9805ae88a4ffa45320319a7ab4ac567e
    http://github.com/hyperic/hqapi/commit/58891a7c9805ae88a4ffa45320319a7ab4ac567e
Author: Ryan Morgan <rm...@hy...>
Date:   2010-01-08 (Fri, 08 Jan 2010)

Changed paths:
  M src/org/hyperic/hq/hqapi1/HQConnection.java

Log Message:
-----------
Backport fix for handling of multiple query parameters of the same name


Commit: c9df798c1859236639ae47a954ae38f1ad123685
    http://github.com/hyperic/hqapi/commit/c9df798c1859236639ae47a954ae38f1ad123685
Author: Ryan Morgan <rm...@hy...>
Date:   2010-01-08 (Fri, 08 Jan 2010)

Changed paths:
  M hqu/hqapi1/app/MetricController.groovy
  M hqu/hqapi1/plugin.properties
  M src/org/hyperic/hq/hqapi1/MetricApi.java
  A src/org/hyperic/hq/hqapi1/test/MetricReschedule_test.java
  M src/org/hyperic/hq/hqapi1/tools/MetricCommand.java
  M xsd/Metric.xsd

Log Message:
-----------
[HHQ-3658] Add MetricApi.reschedule() API.


Commit: 525c0dce0bcdee089bcba8a07ff72af64497c584
    http://github.com/hyperic/hqapi/commit/525c0dce0bcdee089bcba8a07ff72af64497c584
Author: Ryan Morgan <rm...@hy...>
Date:   2010-01-08 (Fri, 08 Jan 2010)

Log Message:
-----------
Merge branch 'hqapi-1.0' into hqapi-2.x


Commit: a0088967bf6f00ed60fc00fc3d08357fe67b424e
    http://github.com/hyperic/hqapi/commit/a0088967bf6f00ed60fc00fc3d08357fe67b424e
Author: Ryan Morgan <rm...@hy...>
Date:   2010-01-08 (Fri, 08 Jan 2010)

Changed paths:
  M ChangeLog
  M hqu/hqapi1/app/MetricController.groovy
  M src/org/hyperic/hq/hqapi1/MetricApi.java
  A src/org/hyperic/hq/hqapi1/test/MetricReschedule_test.java
  M src/org/hyperic/hq/hqapi1/tools/MetricCommand.java
  M xsd/HQApi1.xsd

Log Message:
-----------
[HHQ-3658] Add MetricApi.reschedule() API.


Commit: 1f2cef9f53cdd6b84a48434e496388a9e44f1ed9
    http://github.com/hyperic/hqapi/commit/1f2cef9f53cdd6b84a48434e496388a9e44f1ed9
Author: Ryan Morgan <rm...@hy...>
Date:   2010-01-08 (Fri, 08 Jan 2010)

Changed paths:
  M ChangeLog
  M hqu/hqapi1/app/MetricController.groovy
  M src/org/hyperic/hq/hqapi1/MetricApi.java
  A src/org/hyperic/hq/hqapi1/test/MetricReschedule_test.java
  M src/org/hyperic/hq/hqapi1/tools/MetricCommand.java
  M xsd/HQApi1.xsd

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