cloudstack-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Daan Hoogland <daan.hoogl...@gmail.com>
Subject Re: git commit: updated refs/heads/wip-multi-disk-select to 4c99757
Date Thu, 03 Apr 2014 10:09:22 GMT
Brian,

could you not check in commented out code? We have git, it is a bit of
pollution of our code base.

thanks,
Daan

On Wed, Apr 2, 2014 at 10:58 PM,  <bfederle@apache.org> wrote:
> Repository: cloudstack
> Updated Branches:
>   refs/heads/wip-multi-disk-select f23dd1df9 -> 4c997570b
>
>
> Comment out multiDisk dummy code
>
>
> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
> Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4c997570
> Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4c997570
> Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4c997570
>
> Branch: refs/heads/wip-multi-disk-select
> Commit: 4c997570bb7572c9aacdbbae5295b59428affc4b
> Parents: f23dd1d
> Author: Brian Federle <brian.federle@citrix.com>
> Authored: Wed Apr 2 13:58:26 2014 -0700
> Committer: Brian Federle <brian.federle@citrix.com>
> Committed: Wed Apr 2 13:58:26 2014 -0700
>
> ----------------------------------------------------------------------
>  ui/scripts/instanceWizard.js | 13 +++++++------
>  1 file changed, 7 insertions(+), 6 deletions(-)
> ----------------------------------------------------------------------
>
>
> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4c997570/ui/scripts/instanceWizard.js
> ----------------------------------------------------------------------
> diff --git a/ui/scripts/instanceWizard.js b/ui/scripts/instanceWizard.js
> index 1b93364..d602074 100644
> --- a/ui/scripts/instanceWizard.js
> +++ b/ui/scripts/instanceWizard.js
> @@ -336,12 +336,13 @@
>                              data: {
>                                  diskOfferings: diskOfferingObjs
>                              },
> -                            multiDisk: args.currentData.serviceofferingid === "919ac1bb-be43-4811-8c73-b1c038aac5be"
?
> -                                [
> -                                    { id: 1, label: 'vm-disk-1' },
> -                                    { id: 2, label: 'vm-disk-2' },
> -                                    { id: 3, label: 'vm-disk-3' }
> -                                ] : null
> +                            multiDisk: false
> +                            // multiDisk:
> +                            // [
> +                            //        { id: 1, label: 'vm-disk-1' },
> +                            //        { id: 2, label: 'vm-disk-2' },
> +                            //        { id: 3, label: 'vm-disk-3' }
> +                            // ]
>                          });
>                      }
>                  });
>



-- 
Daan

Mime
View raw message