Commit Graph

16989 Commits

Author SHA1 Message Date
Mice Xia 8d75c8fe7d fix for empty event detail page 2012-08-08 15:49:27 +08:00
John Kinsella 9c22d43e81 Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack 2012-08-08 00:12:39 -07:00
Pranav Saxena 1aea98f622 CS-15898:Change drop down options in vm tier for vpc 2012-08-08 11:03:08 +05:30
David Nalley a60ea41137 adding a symlink to ents file 2012-08-08 00:43:32 -04:00
Sheng Yang 2641b5d6b8 S2S VPN: Fix multiply remote side guest networks 2012-08-07 18:39:45 -07:00
Edison Su 7b7f69b415 CS-10929: Pass error string when raising CloudInternalException
RB: https://reviews.apache.org/r/6449/
Send-by: andy@basho.com
2012-08-07 18:03:58 -07:00
John Kinsella 8ad0cab2b1 Adding my pgp key to KEYS file 2012-08-07 18:03:00 -07:00
Alex Huang 57b57703eb fixed broken unit test 2012-08-07 17:38:05 -07:00
Chip Childers 95c198f356 Updated devcloud README 2012-08-07 20:01:30 -04:00
Alex Huang c1c952b42b should have used non url safe 2012-08-07 16:58:16 -07:00
Sheng Yang c4eadf3011 S2S VPN: CS-15884: Delete iptables rules after delete vpn connection 2012-08-07 16:32:22 -07:00
Sheng Yang 5e0eb93fe6 S2S VPN: CS-15882: Only allow VPN connection between same account's gateways 2012-08-07 16:27:04 -07:00
David Nalley dd949aebaf Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack 2012-08-07 19:05:34 -04:00
Mice Xia 4fadc3be83 adding the zh_CN translation of the runbook 2012-08-07 19:05:06 -04:00
Brian Federle b5e1c53137 CS-15892: Tier detail view: Show 'tier details' instead of 'details'
Conflicts:
	ui/index.jsp
2012-08-07 16:02:07 -07:00
Brian Federle 7de225baa9 CS-15890: ACL multiEdit: Change 'Source CIDR' -> 'CIDR' 2012-08-07 16:00:44 -07:00
Brian Federle 72651f62b7 CS-15891: Add view console action to VPC instances list view
Conflicts:
	ui/css/cloudstack3.css
2012-08-07 16:00:35 -07:00
Brian Federle bcead6eec2 Reduce whitespace to overcome file size limit 2012-08-07 15:59:43 -07:00
Brian Federle 310b24b285 List view: support external link actions
Support actions which point to an external link, primary to support
launching the console proxy.

Example:

listView: {
  actions: {
    viewConsole: {
      label: 'label.view.console',
      action: {
        externalLink: {
          url: function(args) {
            return clientConsoleUrl + '?cmd=access&vm=' + args.context.vpcTierInstances[0].id;
          },
          title: function(args) {
            return args.context.vpcTierInstances[0].id.substr(0,8);
          },
          width: 820,
          height: 640
        }
      }
    }
  }
}
2012-08-07 15:59:36 -07:00
Brian Federle 989ae4609b Reduce whitespace to overcome file size limit 2012-08-07 15:59:12 -07:00
Brian Federle 8630891c07 List view: support external link actions
Support actions which point to an external link, primary to support
launching the console proxy.

Example:

listView: {
  actions: {
    viewConsole: {
      label: 'label.view.console',
      action: {
        externalLink: {
          url: function(args) {
            return clientConsoleUrl + '?cmd=access&vm=' + args.context.vpcTierInstances[0].id;
          },
          title: function(args) {
            return args.context.vpcTierInstances[0].id.substr(0,8);
          },
          width: 820,
          height: 640
        }
      }
    }
  }
}
2012-08-07 15:58:57 -07:00
Alex Huang a617ccc898 Added missing file 2012-08-07 15:52:34 -07:00
Alex Huang a6a864a1a8 Removed Base64 file and use the apache version 2012-08-07 15:41:54 -07:00
Alex Huang 1d3a443237 Added support for component libraries in plugins 2012-08-07 15:40:01 -07:00
David Nalley 75184d33ea few tweaks to fix building docs 2012-08-07 18:29:16 -04:00
Joe Brockmeier b4432e305e DOCS: h-license headers and entity usage - see https://reviews.apache.org/r/6450/ 2012-08-07 18:14:44 -04:00
David Nalley 06c38fd2f8 gitignore was blocking .cfg files 2012-08-07 17:59:53 -04:00
Wido den Hollander f1053f3e3e kvm: Only select emulators which are x84_64 architecture
Libvirt can also return a bunch of emulators for eg ARM and S390

We filter those out since we do not support these architectures.

This way we don't try to start a x86_64 instance with a S390 emulator
2012-08-07 23:17:52 +02:00
Wido den Hollander a1b9b52164 kvm: Remove hardcoded 'cloud' qemu binaries for Hypervisor detection
With the upcoming Apache release we don't ship custom Qemu builds.

libvirt should provide us with the correct information.
2012-08-07 23:17:52 +02:00
Brian Federle c6e58b6ece multiEdit: support validate on custom action
If requireValidation: true is set for a custom action, then only
perform action if multiEdit's form fields are valid. This does not
apply to clicking on existing rules' action buttons.

Syntax:

multiEdit: {
  fields: {
    testField: {
      custom: {
        requireValidation: true,
        ...
      },
      ...
    },
    ...
  }
}

Conflicts:
	ui/scripts/ui/widgets/multiEdit.js
2012-08-07 13:48:27 -07:00
Sheng Yang 46a12b378c CS-15243: Add service combination check at create network offering 2012-08-07 13:17:48 -07:00
Chip Childers 70d0ff8b06 Patch from Joe Brockmeier: Add license headers to g-named files, fix DTD, etc. 2012-08-07 16:10:13 -04:00
Chip Childers 71334f45fc Patch from Joe Brockmeier: Add license headers to f-named files, fix DTD, etc. 2012-08-07 15:55:33 -04:00
Chip Childers 524577307c Patch from Joe Brockmeier: docs/en-US/e* licenses
Adds Apache license to all the e-named files in the docs/en-US folder, also fixes the DTD to point to http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd instead of a file on the local drive, and adds &PRODUCT; in place of CloudPlatform or CloudStack.
2012-08-07 15:09:05 -04:00
Chip Childers cc46d1cf3b Adding setup/.classpath 2012-08-07 14:52:20 -04:00
Chip Childers 4b2d7c61e1 Adding DISCLAIMER, LICENSE and NOTICE files (incomplete) 2012-08-07 14:52:03 -04:00
Alena Prokharchyk 629556c708 Fixed UserContext initialization - got broken by unittest 2012-08-07 11:51:00 -07:00
Alena Prokharchyk 95449da4be Merge branch 'master' into vpc 2012-08-07 11:37:45 -07:00
Alena Prokharchyk bda1e2d08d VPC: more unittests for VpcService
Conflicts:

	server/src/com/cloud/network/vpc/VpcManagerImpl.java
2012-08-07 11:37:36 -07:00
Alena Prokharchyk d38e9eebed VPC: CS-15850 - don't unplug the nic for public network when there are existing ips in the same vlan having network rules
Conflicts:

	server/src/com/cloud/network/vpc/VpcManagerImpl.java
2012-08-07 11:25:02 -07:00
Alena Prokharchyk a83c753354 VPC: CS-15850 - don't unplug the nic for public network when there are existing ips in the same vlan having network rules 2012-08-07 11:24:04 -07:00
Alena Prokharchyk cf64fda5d5 VPC: unittest preparation
Conflicts:

	server/src/com/cloud/network/vpc/VpcManagerImpl.java
	server/test/com/cloud/network/MockNetworkManagerImpl.java
2012-08-07 11:23:52 -07:00
Alena Prokharchyk 972fe01aec VPC: more validation for static route rules: 1) Can't belong to guest cidr defined on Vpc 2) Can't belong to link local cidr
Conflicts:

	server/src/com/cloud/network/vpc/VpcManagerImpl.java
2012-08-07 11:21:53 -07:00
Chip Childers 81ff7a09fd CS-15875 resolved via patch from Andy Gross. 2012-08-07 14:10:11 -04:00
Wido den Hollander 5fa300cd9c kvm: Define CPU shares in domain XML
Since libvirt 0.9.0 this can be specified in the XML.

This used to be set by invoking virsh after starting the instance, but this is cleaner.
2012-08-07 17:49:58 +02:00
Chip Childers 64def0ef3d Removing tools/mockito directory, per discussion on dev list 2012-08-07 11:44:15 -04:00
Wido den Hollander 9212995501 kvm: Fix two small typos 2012-08-07 17:19:38 +02:00
Chip Childers fa7dc09412 Fixed escape issues for wget commands in build_vagrant_basebox.sh 2012-08-07 11:11:27 -04:00
Wido den Hollander 00f12dd156 Add my key to the KEYS file 2012-08-07 12:08:14 +02:00
Abhinandan Prateek 0a2b6436dd bug CS-15859: put a check on volume limit
Author: Abhinandan Prateek <aprateek@apache.org>
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2012-08-07 10:47:54 +05:30