Merge branch 'master' of https://github.com/apache/stratos
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/4b0c42c9 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/4b0c42c9 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/4b0c42c9 Branch: refs/heads/master Commit: 4b0c42c95b371435ce59a913c313ce31f4f89195 Parents: 22a1e87 bbda157 Author: Dinithi <[email protected]> Authored: Wed May 13 18:27:20 2015 +0530 Committer: Dinithi <[email protected]> Committed: Wed May 13 18:27:20 2015 +0530 ---------------------------------------------------------------------- .../src/test/resources/payload/launch-params | 17 +++++++++++++++++ .../domain/CompositeApplicationDefinition.java | 18 ++++++++++++++++++ .../controller/domain/ConfigCartridge.java | 18 ++++++++++++++++++ .../controller/domain/ConfigDependencies.java | 18 ++++++++++++++++++ .../controller/domain/ConfigDependencyPair.java | 18 ++++++++++++++++++ .../cloud/controller/domain/ConfigGroup.java | 18 ++++++++++++++++++ .../InvalidKubernetesMasterException.java | 18 ++++++++++++++++++ .../iaases/cloudstack/CloudStackIaas.java | 18 ++++++++++++++++++ .../CloudStackPartitionValidator.java | 18 ++++++++++++++++++ .../common/beans/application/ComponentBean.java | 18 ++++++++++++++++++ .../application/ScalingDependentsBean.java | 18 ++++++++++++++++++ .../beans/application/StartupOrderBean.java | 18 ++++++++++++++++++ .../policy/autoscale/AutoscalePolicyBean.java | 18 ++++-------------- .../beans/topology/ApplicationInfoBean.java | 18 ++++++++++++++++++ .../common/concurrent/locks/LockMetadata.java | 18 ++++++++++++++++++ .../common/exception/InvalidEmailException.java | 20 +++++++++++++++++++- .../common/internal/ServiceReferenceHolder.java | 18 ++++++++++++++++++ .../org.apache.stratos.custom.handlers/pom.xml | 19 ++++++++++++++++++- .../console/configure_form.jag | 2 +- .../forms/schema/configure/cartridges.json | 8 ++++---- .../forms/schema/configure/partitions.json | 2 +- .../exception/ApplicationSignUpException.java | 20 +++++++++++++++++++- .../AverageRequestsServingCapabilityEvent.java | 20 +++++++++++++++++++- ...eRequestsServingCapabilityEventListener.java | 18 ++++++++++++++++++ ...questsServingCapabilityMessageProcessor.java | 20 +++++++++++++++++++- .../org.apache.stratos.metadata.client/pom.xml | 18 ++++++++++++++++++ .../service/definition/CartridgeMetaData.java | 18 ++++++++++++++++++ .../service/exception/MetadataException.java | 18 ++++++++++++++++++ components/org.apache.stratos.mock.iaas/pom.xml | 18 ++++++++++++++++++ .../src/main/python/cartridge.agent/__init__.py | 16 ++++++++++++++++ .../py/ExtensionExecutor.yapsy-plugin | 17 +++++++++++++++++ .../databridge/thrift/gen/Data/__init__.py | 16 ++++++++++++++++ .../databridge/thrift/gen/Data/constants.py | 20 ++++++++++++++------ .../databridge/thrift/gen/Data/ttypes.py | 19 ++++++++++++++----- .../databridge/thrift/gen/Exception/__init__.py | 16 ++++++++++++++++ .../thrift/gen/Exception/constants.py | 19 ++++++++++++++----- .../databridge/thrift/gen/Exception/ttypes.py | 19 ++++++++++++++----- .../ThriftEventTransmissionService-remote | 20 ++++++++++++++------ .../ThriftEventTransmissionService.py | 19 ++++++++++++++----- .../ThriftEventTransmissionService/__init__.py | 16 ++++++++++++++++ .../ThriftEventTransmissionService/constants.py | 19 ++++++++++++++----- .../ThriftEventTransmissionService/ttypes.py | 19 ++++++++++++++----- .../ThriftSecureEventTransmissionService-remote | 20 ++++++++++++++------ .../ThriftSecureEventTransmissionService.py | 19 ++++++++++++++----- .../__init__.py | 16 ++++++++++++++++ .../constants.py | 20 ++++++++++++++------ .../ttypes.py | 19 ++++++++++++++----- .../modules/databridge/thrift/gen/__init__.py | 16 ++++++++++++++++ .../cartridge.agent/modules/event/__init__.py | 16 ++++++++++++++++ .../plugins/WkaMemberConfigurator.yapsy-plugin | 17 +++++++++++++++++ .../src/test/resources/payload/launch-params2 | 17 +++++++++++++++++ .../util/converter/ObjectConverter.java | 4 ---- .../webapp/api-test/WEB-INF/schemas/schema.xsd | 18 ++++++++++++++++++ .../main/webapp/api/WEB-INF/schemas/schema.xsd | 18 ++++++++++++++++++ 54 files changed, 830 insertions(+), 93 deletions(-) ----------------------------------------------------------------------
