You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ts...@apache.org on 2013/01/26 17:21:39 UTC
[36/50] [abbrv] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-cloudstack
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/2c9e3144
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/2c9e3144
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/2c9e3144
Branch: refs/heads/marvin-refactor-phase1
Commit: 2c9e314477de7cf6b263773b34a957b06a6871ef
Parents: 4ccbdbd 8f11f63
Author: Min Chen <mi...@citrix.com>
Authored: Fri Jan 25 14:15:22 2013 -0800
Committer: Min Chen <mi...@citrix.com>
Committed: Fri Jan 25 14:15:22 2013 -0800
----------------------------------------------------------------------
docs/en-US/offerings.xml | 32 +++++------
docs/en-US/sys-offering-sysvm.xml | 75 +++++++++++++++++++++++++++
ui/scripts/accounts.js | 8 ++-
ui/scripts/system.js | 7 +++
ui/scripts/ui-custom/instanceWizard.js | 15 +++++-
5 files changed, 116 insertions(+), 21 deletions(-)
----------------------------------------------------------------------