telefonicaid / fiware-paas

46%

develop: 46%

LAST BUILD ON BRANCH 2.1.0

branch: 2.1.0

CHANGE BRANCH

x

Reset

• 2.1.0
• develop
• task/checkstyle
• bug/no_session_on_logging_aspects
• bug/CLAUDIA-4200
• feature/upgrade_jersey
• jersey_jackson
• release/1.2.0
• fix_master
• fix_develop
• master
• bug/4372_syncWithSDC
• task/add_attr_validation
• bug/4393_heap_optimize
• feature/addUnitTests
• bug/4256_column_size
• bug/4405_vulnerability
• bug/4121_server_version
• feature/rpm_version
• bug/4042_disable_http
• bug/CLAUDIA-4119
• release/1.3.0
• 1.3.0
• hotfix/1.3.1
• hosfix/cidrnotvalid
• bug/close_wait
• bug/4678_two_tiers
• feature/changeArtifactId
• hotfix/1.3.2
• hotfix/1.3.3
• hotfix/1.3.4
• bug/4690_cache_token
• bug/4678_develop_two_tiers
• bug/4687_close_wait
• 1.3.4
• 1.4.0
• hotfix/1.4.1
• bug/4393_jetty_sh
• bug/4817_tcp_connections
• QA/CLAUDIA-4315_RangeMetadataUPD
• feature/rule_equals
• hotfix/1.4.2
• bug/4852_invalid_token
• bug/4846_sdc_pool
• bug/CLAUDIA-4848
• 1.5.0
• hotfix/1.5.1
• task/CLAUDIA-4891
• bug/ssl_context
• bug/4893_requests_keystone
• QA/python-paasmanagerclient
• feature/v3_api
• CLAUDIA-4928
• QA/fix_keystone_support
• bug/CLAUDIA-4889
• CLAUDIA-4927
• 1.1.0
• feature/4941_commons_properties
• hotfix/1.6.1
• hotfix/1.61
• bug/CLAUDIA-4868
• QA/CLAUDIA-5034_shared_network
• bug/CLAUDIA-4424
• bug/4936_sync_metadata
• bug/4505_header_accept
• bug/CLAUDIA-5156
• bug/5030_specify_subnet
• QA/fix_terrain
• CLAUDIA-5002
• bug/4338_error_trace
• revert-235-story/CLAUDIA-5159
• feature/4636_new_upload_client
• v1.8.0
• QA/CLAUDIA-5161_chef_puppet_new_images
• 1.9.0
• CLAUDIA-5368
• 2.0.0
• bug/CLAUDIA-5337
• bug/5499_ephemeralDhKey
• CLAUDIA-5275
• CLAUDIA-5508
• bug/fix_multithread
• issueIndexReadTheDocs
• readTheDocs
• readthedocs
• readthedocs-projectname
• bug/CLAUDIA-5460
• bug/CLAUDIA-5705
• bug/CLAUDIA-57052
• CLAUDIA-5705
• bug/CLAUDIA-5457
• bug/CLAUDIA-5459
• 2.2.0
• issue/update_readme
• bug/invalid_attribute
• feature/CLAUDIA-5575
• 2.3.0
• issue/doc_update
• 2.4.0
• hardening/doc
• bug/CLAUDIA-5903
• bug/CLAUDIA-5903new
• issue/readthedocs

Merge branch 'release/2.1.0'

Conflicts:
	model/src/test/java/com/telefonica/euro_iaas/paasmanager/model/EnvironmentInstanceTest.java
	pom.xml