You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ch...@apache.org on 2012/07/27 03:36:11 UTC
[7/37] 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
Conflicts:
tools/devcloud/devcloudsetup.sh
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/5f4728be
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/5f4728be
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/5f4728be
Branch: refs/heads/master
Commit: 5f4728beb6951fd4d57a294a701b439b9ba990b2
Parents: 7488b9d d3c0110
Author: chip.childers@gmail.com <ch...@gmail.com>
Authored: Tue Jul 10 22:29:15 2012 -0400
Committer: chip.childers@gmail.com <ch...@gmail.com>
Committed: Tue Jul 10 22:29:15 2012 -0400
----------------------------------------------------------------------
build/build-devcloud.xml | 24 ++++----
tools/devcloud/devcloudsetup.sh | 14 ++++-
ui/css/cloudstack3.css | 61 +++++++++++++++++++
ui/scripts/network.js | 82 ++++++++++++++++++++++++-
ui/scripts/ui-custom/enableStaticNAT.js | 34 +++++++++++
ui/scripts/ui/widgets/multiEdit.js | 27 ++++++++-
6 files changed, 223 insertions(+), 19 deletions(-)
----------------------------------------------------------------------