Skip to content

Commit

Permalink
Merge branch 'release/1.2.2' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
cluther committed Feb 28, 2014
2 parents 5d32440 + e266d5a commit 13f394f
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
3 changes: 3 additions & 0 deletions README.mediawiki
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,9 @@ If you are also using Zenoss to monitor the guest operating system running withi

== Changes ==

;1.2.2
* Fix bug that could prevent data collection.
;1.2.1
* Fix bug in handling of flavor ID. ([https://jira.zenoss.com/browse/ZEN-10333 ZEN-10333])
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# or saved. Do not modify them directly here.
# NB: PACKAGES is deprecated
NAME = "ZenPacks.zenoss.OpenStack"
VERSION = "1.2.2dev"
VERSION = "1.2.2"
AUTHOR = "Zenoss"
LICENSE = "GPLv2"
NAMESPACE_PACKAGES = ['ZenPacks', 'ZenPacks.zenoss']
Expand Down

0 comments on commit 13f394f

Please sign in to comment.