[Hyperic-hq-discuss] [hyperic/hqapi] 3d525c: [HHQ-3583] Fix handling of -s and --secure CLI arg...

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

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

Commit: 3d525c01970ad88026f492b98916b792f2c961a6
    http://github.com/hyperic/hqapi/commit/3d525c01970ad88026f492b98916b792f2c961a6
Author: Ryan Morgan <rm...@hy...>
Date:   2009-12-04 (Fri, 04 Dec 2009)

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

Log Message:
-----------
[HHQ-3583] Fix handling of -s and --secure CLI arguments.


Commit: a6a9bc55836e0cd04c86aff64c77ac4d801fdbad
    http://github.com/hyperic/hqapi/commit/a6a9bc55836e0cd04c86aff64c77ac4d801fdbad
Author: Ryan Morgan <rm...@hy...>
Date:   2009-12-04 (Fri, 04 Dec 2009)

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

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


Commit: 880bd87c7900d46e75d601cd328f18db3657198c
    http://github.com/hyperic/hqapi/commit/880bd87c7900d46e75d601cd328f18db3657198c
Author: Ryan Morgan <rm...@hy...>
Date:   2009-12-04 (Fri, 04 Dec 2009)

Changed paths:
  M ChangeLog

Log Message:
-----------
Update ChangeLog with fix for HHQ-3583


Commit: 7870fe599ac0a82e8bebcaee4932ba4d8301b9b2
    http://github.com/hyperic/hqapi/commit/7870fe599ac0a82e8bebcaee4932ba4d8301b9b2
Author: Ryan Morgan <rm...@hy...>
Date:   2009-12-04 (Fri, 04 Dec 2009)

Changed paths:
  M ChangeLog
  M src/org/hyperic/hq/hqapi1/tools/Command.java

Log Message:
-----------
Fix merge conflict.