etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
36,479 Commits 326 Branches 325 Tags 885 MiB
Commit Graph

221 Commits

Author SHA1 Message Date
kishankavala 49be7eecd2 CLOUDSTACK-9800: Enabled netscaler inline mode. Added corrsponding changes in UI (#1964) 
NetScaler can work in inline mode also along with other Firewall devices. Enabled netscaler inline mode capability
 2017-12-19 04:18:55 +05:30
Rafael Weingärtner 3c6df7c970 CLOUDSTACK-10196: Remove ejb-api 3.0 dependency (#2348) 
Fixed QuotaAlertManagerImplTest, which was injecting mock objects manually.
 2017-12-18 23:59:06 +05:30
Nitin Kumar Maharana e243a31e41 CLOUDSTACK-8672 : NCC Integration with CloudStack. 
Improvements.
 2017-07-20 12:42:43 +05:30
Nitin Kumar Maharana b2b422c7d7 CLOUDSTACK-8672 : NCC Integration with CloudStack. 2017-07-20 12:42:43 +05:30
Priyank Parihar b2f7f9abb6 CLOUDSTACK-8672 : NCC Integration with CloudStack. 2017-07-20 12:42:43 +05:30
Rajesh Battala 884606f77b CLOUDSTACK-8672 : NCC Integration with CloudStack. 2017-07-20 12:42:43 +05:30
Rajani Karuturi 4bc7c270fa Updating pom.xml version numbers for release 4.11.0.0-SNAPSHOT 
Signed-off-by: Rajani Karuturi <rajanikaruturi@gmail.com>
 2017-07-12 12:09:38 +05:30
Rajani Karuturi 9d2893d44a Updating pom.xml version numbers for release 4.10.0.0 
Signed-off-by: Rajani Karuturi <rajanikaruturi@gmail.com>
 2017-07-03 10:06:43 +05:30
Nitin Kumar Maharana 3dc0eed71d CLOUDSTACK-9618: Load Balancer configuration page does not have "Source" method in the drop down list 
Added the source method to supported algorithm list in Netscaler element.
Added a validation check.
 2017-02-15 01:16:48 +05:30
Rohit Yadav 0dce1c50c1 CLOUDSTACK-9456: Update Spring version in maven poms 
- Bump spring-framework version to 4.x and Jetty to version that runs with JDK8
- Bump servet dependency version
- Migrate spring xmls to version 4, fixes schema locations that are 3.0
  dependent in various xmls.
- Fix failing tests due to spring upgrade
  (Thanks @marcaurele Marc-Aurèle Brothier for fixing them)
    * Fix test DeploymentPlanningManagerImplTest
    * Fix GloboDNS test

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2016-12-16 21:21:20 +05:30
Rohit Yadav 70c79ad13c
Merge branch '4.9' 2016-12-07 01:35:56 +05:30
Rohit Yadav abfcd5b95f CLOUDSTACK-9632: Upgrade bouncy castle to version 1.55 
- Upgrades Maven dependency version to v1.55
- Fixes bountycastle usages and issues
- Adds timeout to jetty/annotation scanning
- Fixes servlet issue, uses servlet 3.1.0
- Downgrade javassist used by reflections to fix annotation process errors
- Make console-proxy-rdp bc dependency same as rest of the codebase
- Picks up PR #1510 by Daan

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2016-12-06 17:24:24 +05:30
Nick Livens 62e858131f CLOUDSTACK-9321 : Multiple Internal LB rules (more than one Internal LB rule with same source IP address) are not getting resolved in the corresponding InternalLbVm instance's haproxy.cfg file 
CLOUDSTACK-9321 : Adding component tests for VPC Network functionality - Internal LB rules

CLOUDSTACK-9321 : Extending Nuage VSP Internal LB Marvin tests

Co-Authored-By: Prashanth Manthena <prashanth.manthena@nuagenetworks.net>, Frank Maximus <frank.maximus@nuagenetworks.net>
 2016-11-22 15:51:22 +01:00
Rohit Yadav 9555492b4d Merge branch '4.9' 2016-08-23 14:16:53 +05:30
Rohit Yadav f13c224da1 Updating pom.xml version numbers for release 4.9.1.0-SNAPSHOT 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2016-08-19 13:53:39 +05:30
Will Stevens 62aa3b2bfa Updating pom.xml version numbers for release 4.10.0-SNAPSHOT 
Signed-off-by: Will Stevens <williamstevens@gmail.com>
 2016-07-29 10:11:34 -04:00
Will Stevens 227ff3884d Updating pom.xml version numbers for release 4.9.0 
Signed-off-by: Will Stevens <williamstevens@gmail.com>
 2016-07-25 16:56:04 -04:00
Daan Hoogland 101668994d further maven dependency updates from Daan 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2016-04-22 16:36:37 +05:30
Remi Bergsma 43ab98d823 Updating pom.xml version numbers for release 4.9.0-SNAPSHOT 
Signed-off-by: Remi Bergsma <github@remi.nl>
 2016-01-26 15:12:20 +01:00
Remi Bergsma 32fcc47117 Updating pom.xml version numbers for release 4.8.1-SNAPSHOT 
Signed-off-by: Remi Bergsma <github@remi.nl>
 2016-01-26 09:39:00 +01:00
Remi Bergsma 62f218b7bd Updating pom.xml version numbers for release 4.8.0 
Signed-off-by: Remi Bergsma <github@remi.nl>
 2016-01-20 23:43:35 +01:00
Remi Bergsma 8f5a2920e8 Updating pom.xml version numbers for release 4.8.0-SNAPSHOT 
Signed-off-by: Remi Bergsma <github@remi.nl>
 2015-12-21 22:09:31 +01:00
cirstofolini 1a64c247ad Removed unnecessary @Local annotations and their respective imports from the ComponentLifecycleBase class and its subclasses. 2015-11-21 18:31:11 -02:00
Remi Bergsma 1f53f2a93e Updating pom.xml version numbers for release 4.7.0-SNAPSHOT 
Signed-off-by: Remi Bergsma <github@remi.nl>
 2015-11-15 18:54:13 +01:00
Rajani Karuturi 8bc0294014 Revert "Merge pull request #714 from rafaelweingartner/master-lrg-cs-hackday-003" 
This reverts commit cd7218e241, reversing
changes made to f5a7395cc2.

Reason for Revert:

noredist build failed with the below error:
[ERROR] Failed to execute goal org.apache.maven.plugins:maven-compiler-plugin:3.2:compile (default-compile) on project cloud-plugin-hypervisor-vmware: Compilation failure
[ERROR] /home/jenkins/acs/workspace/build-master-noredist/plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java:[484,12] error: non-static variable logger cannot be referenced from a static context
[ERROR] -> [Help 1]

even the normal build is broken as reported by @koushik-das on dev list
http://markmail.org/message/nngimssuzkj5gpbz
 2015-08-31 11:27:57 +05:30
Rafael Weingartner 3818257a68 Solved jira ticket: CLOUDSTACK-8750 2015-08-28 22:35:08 -03:00
Daan Hoogland e2b6237464 CLOUDSTACK-8656: debug messages on interupted exceptions 2015-07-30 16:03:10 +02:00
Daan Hoogland 85e002b230 CLOUDSTACK-8656: filling empty catch block with info messages 
using regexp "catch\s*\(\s*(Exception|Throwable)\s*\w*\)\s*\{\s*\}"
 2015-07-30 15:51:52 +02:00
Rafael da Fonseca 1494487f72 Fix findbugs warning in NetscalerResource.java Unnecessary boxing/unboxing of primitive value 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

This closes #426
 2015-06-15 12:09:41 +03:00
Hugo Trippaers 4ebaf0a583 Bump master version to 4.6.0-SNAPSHOT after branching 4.5.0-SNAPSHOT 2014-10-29 14:54:23 +01:00
Hugo Trippaers 0080905ad4 CID-1249803 Remove dead code 2014-10-29 11:10:41 +01:00
Rajesh Battala 0f528df228 CLOUDSTACK-7313 Fixed issues in provisioning vpx in SDX from CS 2014-10-13 15:57:13 +05:30
Hugo Trippaers dc3f0cbc63 Improve the handling of the findbug exclude files 2014-09-03 10:41:22 +02:00
Santhosh Edukulla 19ffc93e2e Fixed few coverity reported issues:Aug22 2014 2014-08-21 17:09:27 +05:30
Will Stevens d3af2dbeca CLOUDSTACK-6886 - Fixed the issue created by the SSL feature with the SDX: 2014-07-22 17:28:01 -04:00
Sujaya Maiyya e07d0ddabf fixed CLOUDSTACK-6261: remove the forceful timeout setting when login to NetScaler. 2014-07-09 22:08:14 +05:30
Rajesh Battala d64adf5912 CLOUDSTACK-7037 Unable to add new vm/service to existing LB rule of SSL protocol 2014-07-02 16:06:39 +05:30
Santhosh Edukulla 97d296bfbd Fixed Coverity reported performance issues like inefficient string concatenations, wrong boxing or unboxing types, inefficent map element retrievals 
Signed-off-by: Daan Hoogland <daan@onecht.net>
 2014-07-01 22:06:25 +02:00
Rajesh Battala ca6e6e2b7c CLOUDSTACK-6338 [Automation] Failed to NetScaler Device with error 2014-04-24 17:10:23 +05:30
Daan Hoogland 8b62b2cb92 findbugs: exclude known spiffy hacks a.k.a. false positives 2014-03-28 14:28:10 +01:00
Alena Prokharchyk ee99d5ee8d NescalerResource - added missing "return" statement 2014-03-14 09:45:27 -07:00
Hugo Trippaers 4402685e11 Update master to 4.5.0-SNAPSHOT 2014-03-14 14:55:26 +01:00
Min Chen 48e08fe676 Merge branch 'master' into rbac. 2014-03-06 14:02:20 -08:00
Mandar Barve b0c6d47347 - Updated APICommand annotation to add new flags that indicate if API request or response carry sensitive info - Updated all API classes with the new annotation flag values as per the API's sensitivity - Updated server code to check response annotation before audit logging 
Signed-off-by: Daan Hoogland <daan@onecht.net>
(cherry picked from commit df270d6387c362b960064ee5123c14782e767a19)
Signed-off-by: Daan Hoogland <daan@onecht.net>
 2014-02-25 22:59:10 +01:00
Min Chen 3b58a45e04 Merge branch 'master' into rbac. 2014-02-07 13:43:36 -08:00
Syed Ahmed 356daf3eed Review 16080 Move Netscaler plugin from non-oss to oss and upgrade the nitro API to 10.1 
Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com>
 2014-02-05 14:03:49 +01:00
Min Chen 929fbabaa2 Merge branch 'master' into rbac. 2014-01-17 14:37:08 -08:00
Min Chen add277a4aa Separate network and VPC related cmd to use two different views. 2013-12-12 16:53:59 -08:00
Alex Huang be5e5cc641 All Checkstyle problems corrected 2013-12-12 12:26:07 -08:00
Murali Reddy be67f5d17a CLOUDSTACK-5428: support NetScaler to be configured exclusively for GSLB 
service and not used for LB

Fix adds a boolean flag to addNetscalerLoadBalancer api, which
will mark added NetScaler for exclusive GSLB service. A netscaler marked
as exclusive gslb service provider is not picked for any guest network's
lb provider.
 2013-12-10 06:20:58 +05:30
Syed Ahmed ee7380ace2 CLOUDSTACK-5296: Add certificate chain support for netscaler 
This patch adds support for trust chains in the netscaler.

I initially planned on using the 10.1 API's "bundle" feature but during
my testing I found that was not working. So I am doing the chain linking
myself. Also NS can have only one entity of a certificate ie lets say
two different users try to add the same certificate on the netscaler
only one of them will go through. The other one says resouce already
exists even though they have different files.

This can be a problem in trust chains where the chain can be shared
between multiple accounts/certificates. So, I am using the figerprint as
an identifier of a certificate and making sure that we delete it only
when no one references it.
 2013-12-05 15:35:28 +05:30
Darren Shepherd eb21239e3f CLOUDSTACK-5224: Add missing configuration for Netscaler, F5, SRX, and VNMC 2013-11-25 12:03:49 -07:00
Alex Huang 433a631916 Reformat of source code to set a stable base for the future. I couldn't get checkstyle enabled. There's still about a thousand errors from checkstyle. Most of it from length errors from comments and strings. Will attempt to remove those tonight. This change is so large I just want to get it in before any merge nightmares. The changes are fairly minor though and I did a full compile and start a server with the reformat code. 2013-11-21 07:56:47 -08:00
Hugo Trippaers cf715ff491 Bump 4.3.0 to 4.4.0 in master 2013-11-21 16:01:15 +01:00
Alex Huang d620df2bdd Reformatted all of the code. 2013-11-21 06:15:26 -08:00
Alex Huang 224f479974 Removed trailing spaces 2013-11-21 04:08:01 -08:00
Alex Huang 8d62744681 Reformat all source code. Added checkstyle to check the source code 2013-11-20 07:26:53 -08:00
Syed 0076307863 Squashed merge of Ssl Termination feature 
Bug: https://issues.apache.org/jira/browse/CLOUDSTACK-4821
FS: https://cwiki.apache.org/confluence/display/CLOUDSTACK/SSL+Termination+Support

This patch implements the SSL offload feature for loadbalancers
and includes the implementaion for this to work with Netscaler.

The following are the new API's that this patch adds

uploadSslCert
deleteSslCert
listSslCert
assignCertToLoadBalancer
removeCertFromLoadBalancer

Unit tests are also included in the patch.
 2013-11-08 16:49:16 +05:30
Darren Shepherd 9cbb309d6b Refactor missed classes 2013-10-17 16:00:11 -07:00
Laszlo Hornyak bd8536739c remove txn attribute from DB 
txn attribute was never actually used

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
 2013-10-04 10:15:39 -07:00
Daan Hoogland 2614b00c51 sdn hosted vpc gateways (using lswitch) 2013-09-18 16:56:56 +02:00
Rajesh Battala bb26b854fb CLOUDSTACK-4237 [Autoscale] Account deletion doesn't delete all autoscaled LB rules created by the account 2013-08-17 14:32:17 +05:30
Rajesh Battala 5cd8edd443 CLOUDSTACK-3369 Autoscaling: Deleting an isolated network of an account deletes also the autoscaling rule for a network associated with another account 2013-08-13 22:29:53 +05:30
Alex Huang 5495f10bce Revert "Reverting the range of commits that broke the build" 
This reverts commit b59e3aaefc.
 2013-08-08 15:02:40 -07:00
Prasanna Santhanam b59e3aaefc Reverting the range of commits that broke the build 
This reverts commits 30c33415..f6a2c817bc

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
 2013-08-08 14:46:56 +05:30
Alex Huang 942f282a6e Moved config into it's own package 2013-08-07 16:41:02 -07:00
Murali Reddy ea5be13761 CLOUDSTACK-4048:[GSLB] Failed to assign more than one LB rule to a GSLB rule that is 
created with gslbmethod=leastconn

Netscaler nitro api to add gslb virtual servers fails for some reason if
both netmask and round robin methods are specified. So working around
with settign netmask to be null while updating vserver.
 2013-08-05 19:36:25 +05:30
Chip Childers 8225374138 Updating pom.xml version numbers for release 4.3.0-SNAPSHOT 
Signed-off-by: Chip Childers <chipchilders@apache.org>
 2013-08-01 10:35:00 -04:00
Murali Reddy 5695db80ac CLOUDSTACK-3731: [GSLB] deleteGlobalLoadBalancerRule fails with the 
java.lang.NumberFormatException

While deleting LB monitor and GSLB service binding Nitro API fails
with wierd NumberFormatException. Adding a workaround to delete the LB
monitor after GSLB service is delted (which ensures intenrally LB
monitor is delted).
 2013-08-01 04:51:24 +05:30
Alex Huang 1325014a03 Changed VirtualMachineProfile to be non-generic. From here on VirtualMachineManager will only manage vm instance. It doesn't understand the difference between different types of VMs. This makes the vmsync code to be generic across all vms. 2013-07-22 11:48:11 -07:00
ahuang 11e1e585b1 UserContext switched to CallContext. Added generic storage mechanism for other code to carry information throughout a call. Made the calling User and Account a must have. Added an interface to carry entities in error. Fixed up the code. Part of the vmsync branch 2013-07-16 11:24:21 -07:00
Murali Reddy 467fa6117e CLOUDSTACK-2346: [GSLB] dedicated vs shared GSLB devices and LB devices 
Only one NetScaler device can act as GSLB service provider in a zone for
all the tenants and thier networks, so restrict addign NetScaler device
to be shared use when configure as GSLB service provider.
 2013-07-15 16:31:18 +05:30
Murali Reddy 2f3764ef94 CLOUDSTACK-1959: GSLB: add capability to provide weights to the sites 
involved in the GSLB

add weights to each site participating in the GSLB. Traffic will be load
balanced across the sites based on the weigths associated with each
site. If not specified weight of site is defaulted to 1.
 2013-07-02 17:55:58 +05:30
Murali Reddy e07a8b3f51 CLOUDSTACK-3282:[GSLB] Unable to add multiple LB rules to same GSLB rule 
-fixing regression due to adding GSLB monitor for GSLB service

-code to add/delete GSLB monitor and GSLB service-monitor binding is
made idempotenet so as to succeed if the resource exists.
 2013-07-01 19:07:00 +05:30
Murali Reddy 6a92f3b8ac CLOUDSTACK-2741: [GSLB] GSLB service doesn't come up if the LB rule 
mapped to it is serviced by VR

For remote LB services that are not running on NetScaler, there needs to
be a LB monitor bound to GSLB service. Otherwise service is shown down.
This fix binds a LB monitor with GSLB services.
 2013-06-05 12:10:36 +05:30
Murali Reddy 62d320454a CLOUDSTACK-2360: listnetscalerloadbalancerresponse is not including any 
information about GSLB status

adds the infomration if NetScaler is provisioned as GSLB service
provider
 2013-05-22 16:26:46 +05:30
Murali Reddy f441582e1b CLOUDSTACK-2378: assignToGSLBRule or removeFromGlobalLoadBalancerRule APIs are failing when there are multiple physical network in a zone 
adding support for deployments where multiple physical networks are configured for guest traffic in a zone
 2013-05-16 18:26:14 +05:30
Murali Reddy 33e683915c CLOUDSTACK-2462: Failed to create GSLB rule with "proximity" algorithm 
add RTT as load balancing method for GSLB vserver
 2013-05-16 15:19:42 +05:30
Alena Prokharchyk dbb223e4de Fixed applyLbRules for Netscaler. 2013-05-15 10:32:32 -07:00
Nitin Mehta c11dbad9c9 merge master 2013-05-11 15:28:43 +05:30
Murali Reddy bc3e184b72 CLOUDSTACK-312: enable L4-L7 network services in the shared network in 
the advanced zone

Squashed commit of the following:

commit 3021cb917b2446f6a04f6cbb01bc56ebc5484bff
Merge: 77c6991 886fe01
Author: Murali Reddy <murali.reddy@citrix.com>
Date:   Sun Apr 14 17:22:05 2013 +0530

    Merge branch 'master' into sharednetworkservices

commit 77c69918be
Author: Murali Reddy <murali.reddy@citrix.com>
Date:   Tue Apr 9 17:16:57 2013 +0530

    Trying to fit both isolated and shared network life cycle with single state
    machine may need addtional work. So set network state for shared network explicitly now.

commit 365ed73a0c
Author: Murali Reddy <murali.reddy@citrix.com>
Date:   Tue Apr 2 17:14:11 2013 +0530

    - associateIpAddress API to associate a public IP with shared network
    - shared network with services to go through the implement and shutwdon
      phases
 2013-04-14 17:50:15 +05:30
Hugo Trippaers f09d981c3e Switching netscaler to the maven location of the 
netscaler.nitro jar.

If it's there we might as well use it.

This fixes build problems for people with old netscaler jars as the
version was not updated in the jar.
 2013-04-08 12:34:57 +02:00
Murali Reddy c5fb8349bf CLOUDSTACK-653 : High Availability: implement GSLB (Global Server Load 
Balancing) capability for ELB service

merging GSLB feature
 2013-03-27 17:54:07 +05:30
Vijay venkatachalam 61d8dde033 CLOUDSTACK-1537. Fixing Network Restart case for AutoScale 2013-03-21 16:59:15 +00:00
Rajesh Battala 183b989d30 CLOUDSTACK-664:AWS-Health Check feature: Patch applied cleanly , RAT build is successful 2013-03-18 14:01:15 +05:30
Murali Reddy 2feda05ecd CLOUDSTACK-1427: Failed to delete Guestnetwork which has LB with 
Netscaler

There is no need for getIpDeployer to depend on the fact a NetScaler
device is allocated (network is implemented state) or not-allocated
(network is in shutdown state)
 2013-03-13 17:30:15 +05:30
Rohit Yadav 80d58b6c73 CLOUDSTACK-1317: Bump CloudStack package version to 4.2.0-SNAPSHOT in all poms 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-02-20 16:42:56 +05:30
Kelven Yang 176523254e Improve component lifecycle management with system run-level concept 2013-01-30 15:21:02 -08:00
Kelven Yang af4485ae9e Put nonoss under Spring framework 2013-01-25 15:41:48 -08:00
Edison Su 4fbecf15ec add unit test back, primary storage life cycle is tested 2013-01-21 17:01:00 -08:00
Alex Huang 10d9c019a9 All merge conflicts resolved 2013-01-18 12:14:57 -08:00
Koushik Das 070856affd CLOUDSTACK-988: HV version must be updated in hypervisor_version column of host table HV version is stored in hypervisor_version column in host table wherever present Also correctly populating version column in host table with resource file version 
Signed-off-by: Koushik Das <koushik.das@citrix.com>
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
 2013-01-18 16:49:52 +05:30
Chiradeep Vittal 56cd809600 Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack 
Re-merge with network-refactor
 2013-01-17 11:32:49 -08:00
Min Chen 3dabd5fbf3 Clean up ApiServer, ApiServlet and ApiDispatcher flow to handle various CloudRuntimeException 
and CloudException in one place, and Introduced ApiErrorCode to handle CloudStack API error
code to standard Http code mapping.

Signed-off-by: Min Chen <min.chen@citrix.com>
 2013-01-16 22:36:34 -08:00
Chiradeep Vittal cadca5fc0c Merge branch 'master' into network-refactor-merge2 
Conflicts:
	api/src/com/cloud/network/NetworkService.java
	api/src/com/cloud/network/element/RemoteAccessVPNServiceProvider.java
	plugins/network-elements/nicira-nvp/src/com/cloud/network/element/NiciraNvpElement.java
	server/src/com/cloud/acl/DomainChecker.java
	server/src/com/cloud/network/ExternalFirewallDeviceManagerImpl.java
	server/src/com/cloud/network/NetworkManager.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/test/com/cloud/network/MockNetworkManagerImpl.java
	server/test/com/cloud/vpc/MockNetworkManagerImpl.java
 2013-01-16 19:17:14 -08:00
Kelven Yang 497dcd5044 Get rid of PlugService annotation, replace it with Spring standard injection in command classes 2013-01-16 18:44:44 -08:00
Murali Reddy 88a0b5ac48 Revert "Summary: partical check-in for L4-L7 network services in the shared" 
This reverts commit 6657246cd4.

Reverting due to IP clearance issued for the commit done as part of CLOUDSTACK-312
 2013-01-16 16:05:17 +05:30
Rohit Yadav bca2c928e8 PluggableService: Fix interface definition 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-14 19:01:26 -08:00
Alex Huang 1294cdc701 pulled from master 2013-01-10 16:01:01 -08:00
Alex Huang d6f44a4d6a merged from master 2013-01-10 15:55:42 -08:00