Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/9c22d43e Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/9c22d43e Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/9c22d43e Branch: refs/heads/vpc Commit: 9c22d43e81f914f03108aa6dd755cb7830845f5c Parents: 8ad0cab a60ea41 Author: John Kinsella <[email protected]> Authored: Wed Aug 8 00:12:39 2012 -0700 Committer: John Kinsella <[email protected]> Committed: Wed Aug 8 00:12:39 2012 -0700 ---------------------------------------------------------------------- docs/en-US/release-notes-3.0.4.ent | 1 + python/lib/cloudutils/syscfg.py | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) ----------------------------------------------------------------------
