[Hyperic-hq-discuss] [hyperic/hqapi] 88b621: Hand merge null check for getResource(id) from 2.x...

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

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

Commit: 88b6214fd6a243296e8d2d8ccb9307007d9067ce
    http://github.com/hyperic/hqapi/commit/88b6214fd6a243296e8d2d8ccb9307007d9067ce
Author: Ryan Morgan <rm...@hy...>
Date:   2009-09-30 (Wed, 30 Sep 2009)

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

Log Message:
-----------
Hand merge null check for getResource(id) from 2.x tree.


Commit: b950ccb4f0b32fac87d382a97f35a1c4ad243542
    http://github.com/hyperic/hqapi/commit/b950ccb4f0b32fac87d382a97f35a1c4ad243542
Author: pnguyen <pnguyen@192.168.1.66>
Date:   2009-11-18 (Wed, 18 Nov 2009)

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

Log Message:
-----------
[HHQ-3513] To improve performance, use the resourceId (new) and description from the ServiceValue object if available.


Commit: 40c3625832f13a9db54a38e6e9a16fabc92749ce
    http://github.com/hyperic/hqapi/commit/40c3625832f13a9db54a38e6e9a16fabc92749ce
Author: Patrick Nguyen <pnguyen@patrick-nguyens-macbook-pro.local>
Date:   2009-11-19 (Thu, 19 Nov 2009)

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

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


Commit: de4e5d6382a1282036589b90ab9e05d66ffa1ec5
    http://github.com/hyperic/hqapi/commit/de4e5d6382a1282036589b90ab9e05d66ffa1ec5
Author: Patrick Nguyen <pnguyen@patrick-nguyens-macbook-pro.local>
Date:   2009-11-19 (Thu, 19 Nov 2009)

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

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