- OpenStack-announce - lists.openstack.org

[new][puppet] puppet-sahara 9.2.0 release (newton)
by no-reply＠openstack.org 29 Aug '16

29 Aug '16

We are amped to announce the release of: puppet-sahara 9.2.0: Puppet module for OpenStack Sahara This release is part of the newton release series. For more details, please see below. 9.2.0 ^^^^^ Other Notes * Tests updated to leverage rspec-puppet-facts for testing multiple OS versions. Changes in puppet-sahara 9.1.0..9.2.0 ------------------------------------- c0c5884 Prepare 9.2.0 (newton b3) 1393945 Move other-requirements.txt to bindep.txt 55a0c0f Add dependency on node group template for cluster template c1cba67 Add support for creating and managing Sahara templates 0bb472d Include openstacklib defaults manifest. 1600fde Switch sahara to use rspec-puppet-facts Diffstat (except docs and test files) ------------------------------------- bindep.txt | 0 lib/puppet/provider/sahara.rb | 91 ++++++++++++ .../provider/sahara_cluster_template/openstack.rb | 84 +++++++++++ .../sahara_node_group_template/openstack.rb | 156 +++++++++++++++++++++ lib/puppet/type/sahara_cluster_template.rb | 61 ++++++++ lib/puppet/type/sahara_node_group_template.rb | 81 +++++++++++ manifests/params.pp | 1 + metadata.json | 8 +- other-requirements.txt | 0 .../notes/rspec-puppet-facts-a858ae8d93a726a9.yaml | 4 + releasenotes/source/conf.py | 4 +- spec/classes/sahara_all_spec.rb | 41 +++--- spec/classes/sahara_api_spec.rb | 45 +++--- spec/classes/sahara_client_spec.rb | 24 ++-- spec/classes/sahara_config_spec.rb | 55 +++++--- spec/classes/sahara_db_mysql_spec.rb | 20 ++- spec/classes/sahara_db_spec.rb | 52 ++++--- spec/classes/sahara_db_sync_spec.rb | 22 +-- spec/classes/sahara_engine_spec.rb | 37 ++--- spec/classes/sahara_init_spec.rb | 35 ++--- spec/classes/sahara_keystone_auth_spec.rb | 118 +++++++++------- spec/classes/sahara_logging_spec.rb | 20 ++- spec/classes/sahara_notify_spec.rb | 61 ++++---- spec/spec_helper.rb | 7 +- .../sahara_cluster_template/openstack_spec.rb | 98 +++++++++++++ .../sahara_node_group_template/openstack_spec.rb | 118 ++++++++++++++++ spec/unit/provider/sahara_spec.rb | 46 ++++++ spec/unit/type/sahara_cluster_template_spec.rb | 68 +++++++++ spec/unit/type/sahara_node_group_template_spec.rb | 38 +++++ 29 files changed, 1129 insertions(+), 266 deletions(-)

1 0

[new][puppet] puppet-trove 9.2.0 release (newton)
by no-reply＠openstack.org 29 Aug '16

29 Aug '16

We are thrilled to announce the release of: puppet-trove 9.2.0: Puppet module for OpenStack Trove This release is part of the newton release series. For more details, please see below. 9.2.0 ^^^^^ New Features ************ * Configure keystonemiddleware in a consistent way with all options required for Keystone v3. * Support for policy files which are being added to Trove. Deprecation Notes ***************** * trove::api::keystone_tenant is deprecated in favor of trove::keystone::authtoken::project_name. * trove::api::keystone_user is deprecated in favor of trove::keystone::authtoken::username. * trove::api::keystone_password is deprecated in favor of trove::keystone::authtoken::password. * trove::api::identity_uri is deprecated in favor of trove::keystone::authtoken::auth_url. * trove::api::auth is deprecated in favor of trove::keystone::authtoken::auth_uri. Changes in puppet-trove 9.1.0..9.2.0 ------------------------------------ 61de141 Prepare 9.2.0 (newton b3) e2729f0 Policy support for Trove b51e789 Configure keystone authtoken options 7558054 Move other-requirements.txt to bindep.txt 3cf09ad Include openstacklib defaults manifest. Diffstat (except docs and test files) ------------------------------------- bindep.txt | 0 lib/puppet/provider/trove.rb | 20 +- manifests/api.pp | 211 ++++++---------- manifests/keystone/authtoken.pp | 279 +++++++++++++++++++++ manifests/params.pp | 1 + manifests/policy.pp | 33 +++ metadata.json | 8 +- other-requirements.txt | 0 releasenotes/notes/authtoken-bcb9cc0581080079.yaml | 10 + .../policy-file-support-06db0c1ae60284a5.yaml | 4 + releasenotes/source/conf.py | 4 +- spec/classes/trove_api_spec.rb | 39 +-- spec/classes/trove_keystone_authtoken_spec.rb | 145 +++++++++++ spec/classes/trove_policy_spec.rb | 39 +++ 14 files changed, 612 insertions(+), 181 deletions(-)

1 0

[new][puppet] puppet-swift 9.2.0 release (newton)
by no-reply＠openstack.org 29 Aug '16

29 Aug '16

We are thrilled to announce the release of: puppet-swift 9.2.0: Puppet module for OpenStack Swift This release is part of the newton release series. For more details, please see below. 9.2.0 ^^^^^ New Features ************ * add new parameters to configure authtoken for swift, like username, password, project_name, auth_url, auth_plugin, project_domain_id, user_domain_id, include_service_catalog * Added parameters to configure the statsd integration for the account, container, object and proxy services. log_statsd_host, log_statsd_port, log_statsd_default_sample_rate, log_statsd_sample_rate_factor and log_statsd_metric_prefix can be configured if statsd_enabled is set to true for the swift::storage::services resource. * Allows configuring CORS settings. Deprecation Notes ***************** * admin_token * admin_tenant_name in favor of project_name * admin_password in favor of password * admin_user in favor of username * identity_uri in favor of auth_url * The Swift Keystone middleware option is_admin has been deprecated in the Mitaka release and should be no longer used. It has no more effect and will be removed in a future version. Bug Fixes ********* * remove auth_host, auth_port, auth_protocol, auth_admin_prefix Changes in puppet-swift 9.1.0..9.2.0 ------------------------------------ 3eb1b82 Prepare 9.2.0 (newton b3) 2d970a2 Trim useless blank lines in generated config file a266ab9 Change swift authtoken 658f658 Add statsd configuration options 212d4ab Add log directory to .gitignore 623dffa Add CORS settings 60266da Move other-requirements.txt to bindep.txt 0725547 unit: improve output description for swift ring builder dcc8ca5 Add support for Swift Ring Builder 2.9.1+ 287a714 Allow for usage of storage::disk via Hiera 0bb5205 Deprecate is_admin option from Keystone mw config in Swift proxy e8959ee Fix comment typo a5e15bb Include openstacklib defaults manifest. 33a705d Fix xinetd version to match integration Diffstat (except docs and test files) ------------------------------------- .gitignore | 1 + bindep.txt | 0 lib/puppet/provider/swift_ring_builder.rb | 22 ++- manifests/params.pp | 1 + manifests/proxy.pp | 12 ++ manifests/proxy/authtoken.pp | 189 ++++++++++++--------- manifests/proxy/formpost.pp | 2 +- manifests/proxy/keystone.pp | 17 +- manifests/storage/all.pp | 82 ++++++--- manifests/storage/disks.pp | 29 ++++ manifests/storage/server.pp | 76 ++++++--- metadata.json | 6 +- other-requirements.txt | 0 releasenotes/notes/authtoken-b49c75db4b7429cb.yaml | 13 ++ .../statsd-configuration-c839c5485f761109.yaml | 8 + .../notes/swift_cors-31b9a30d0eca57ce.yaml | 3 + ...stone_middleware_is_admin-3743720dc053f65e.yaml | 5 + releasenotes/source/conf.py | 4 +- spec/acceptance/basic_swift_spec.rb | 2 +- spec/classes/swift_bench_spec.rb | 6 +- spec/classes/swift_client_spec.rb | 4 +- spec/classes/swift_dispersion_spec.rb | 2 +- spec/classes/swift_objectexpirer_spec.rb | 12 +- spec/classes/swift_proxy_authtoken_spec.rb | 74 +++----- spec/classes/swift_proxy_ceilometer_spec.rb | 4 +- spec/classes/swift_proxy_keystone_spec.rb | 3 - spec/classes/swift_proxy_spec.rb | 40 +++-- spec/classes/swift_proxy_swift3_spec.rb | 6 +- spec/classes/swift_ringbuilder_spec.rb | 6 +- spec/classes/swift_ringserver_spec.rb | 12 +- spec/classes/swift_spec.rb | 6 +- spec/classes/swift_storage_account_spec.rb | 13 +- spec/classes/swift_storage_all_spec.rb | 42 ++++- spec/classes/swift_storage_container_spec.rb | 13 +- spec/classes/swift_storage_disks_spec.rb | 51 ++++++ spec/classes/swift_storage_object_spec.rb | 13 +- spec/classes/swift_storage_spec.rb | 6 +- spec/defines/swift_storage_generic_spec.rb | 18 +- spec/defines/swift_storage_node_spec.rb | 6 +- spec/defines/swift_storage_server_spec.rb | 7 +- .../puppet/provider/swift_ring_builder_spec.rb | 39 +++++ templates/account-server.conf.erb | 7 + templates/container-server.conf.erb | 7 + templates/object-server.conf.erb | 7 + templates/proxy-server.conf.erb | 39 +++-- templates/proxy/authtoken.conf.erb | 31 ++-- templates/proxy/keystone.conf.erb | 1 - 48 files changed, 633 insertions(+), 320 deletions(-)

1 0

[new][openstackansible] openstack-ansible 12.2.2 release
by no-reply＠openstack.org 29 Aug '16

29 Aug '16

We are tickled pink to announce the release of: openstack-ansible 12.2.2: Ansible playbooks for deploying OpenStack With source available at: http://git.openstack.org/cgit/openstack/openstack-ansible For more details, please see below. 12.2.2 ^^^^^^ Known Issues ************ * For OpenStack-Ansible Liberty releases earlier than 12.2.2 the default container apt source used was "https://mirror.rackspace.com/ubuntu". This mirror seems to sometimes have broken package indexes or missing packages. The default package source has therefore been changed to make use of "http://archive.ubuntu.com/ubuntu" for packages and "http://security.ubuntu.com/ubuntu" for security packages. Upgrade Notes ************* * The default container apt sources have been changed from using "https://mirror.rackspace.com/ubuntu" to "http://archive.ubuntu.com/ubuntu" for packages and "http://security.ubuntu.com/ubuntu" for security packages. This is to resolve issues with unavailable packages during the install process due to incomplete mirror updates. Bug Fixes ********* * The "--compact" flag has been removed from xtrabackup options. This had been shown to cause crashes in some SST situations Changes in openstack-ansible 12.2.1..12.2.2 ------------------------------------------- 43c3baa Print remaining tasks on failed upgrade correctly fffe55f Fix memcached flush if -l is in hostname 7276dc0 Update all SHAs for 12.2.2 4961b85 Add ignore_errors to fix minor bug with fallback source for apt-key. 4e193a7 Set use_stderr to False for all services 92ac36d remove compact option from xtrabackup b335176 Change default apt sources to standard Ubuntu sources Diffstat (except docs and test files) ------------------------------------- global-requirement-pins.txt | 2 +- .../defaults/repo_packages/openstack_services.yml | 26 +++++++++++----------- playbooks/inventory/group_vars/all.yml | 2 +- playbooks/inventory/group_vars/hosts.yml | 2 +- .../tasks/galera_client_pre_install.yml | 1 + .../roles/galera_server/templates/cluster.cnf.j2 | 1 - playbooks/roles/lxc_hosts/defaults/main.yml | 4 ++-- playbooks/roles/os_aodh/templates/aodh.conf.j2 | 1 + .../os_ceilometer/templates/ceilometer.conf.j2 | 1 + playbooks/roles/os_cinder/templates/cinder.conf.j2 | 1 + .../roles/os_glance/templates/glance-api.conf.j2 | 1 + .../roles/os_glance/templates/glance-cache.conf.j2 | 1 + .../os_glance/templates/glance-manage.conf.j2 | 1 + .../os_glance/templates/glance-registry.conf.j2 | 1 + .../os_glance/templates/glance-scrubber.conf.j2 | 1 + playbooks/roles/os_heat/templates/heat.conf.j2 | 1 + .../roles/os_keystone/templates/keystone.conf.j2 | 1 + .../roles/os_neutron/templates/dhcp_agent.ini.j2 | 1 + .../roles/os_neutron/templates/l3_agent.ini.j2 | 1 + .../os_neutron/templates/metadata_agent.ini.j2 | 1 + .../os_neutron/templates/metering_agent.ini.j2 | 1 + .../roles/os_neutron/templates/neutron.conf.j2 | 1 + playbooks/roles/os_nova/templates/nova.conf.j2 | 1 + .../roles/os_tempest/templates/tempest.conf.j2 | 1 + ...change-default-apt-mirror-dd2a22ec24b2a081.yaml | 15 +++++++++++++ ...trabackup-compact-disable-8ae9215207147ebc.yaml | 4 ++++ scripts/run-upgrade.sh | 12 +++++++--- scripts/scripts-library.sh | 2 +- .../playbooks/memcached-flush.yml | 2 +- 29 files changed, 66 insertions(+), 24 deletions(-)

1 0

[new][puppet] puppet-oslo 9.2.0 release (newton)
by no-reply＠openstack.org 29 Aug '16

29 Aug '16

We are high-spirited to announce the release of: puppet-oslo 9.2.0: Puppet module for Oslo This release is part of the newton release series. For more details, please see below. 9.2.0 ^^^^^ New Features * Add oslo::privsep define to configure privsep_${entrypoint} section of given config resource. Changes in puppet-oslo 9.1.0..9.2.0 ----------------------------------- 7d80bb5 Prepare 9.2.0 (newton b3) f808902 Add support for oslo privilege separator management e3e5e41 Move other-requirements.txt to bindep.txt d028124 cache: don't hardcode keystone-package tag to memcached package ebce860 Include openstacklib defaults manifest. Diffstat (except docs and test files) ------------------------------------- bindep.txt | 0 manifests/cache.pp | 2 +- manifests/params.pp | 1 + manifests/privsep.pp | 59 ++++++++++++++++++++++ metadata.json | 4 +- other-requirements.txt | 0 .../notes/add_oslo_privsep-3f125445bce8b431.yaml | 4 ++ releasenotes/source/conf.py | 4 +- spec/defines/oslo_cache_spec.rb | 2 +- spec/defines/oslo_privsep_spec.rb | 53 +++++++++++++++++++ 10 files changed, 123 insertions(+), 6 deletions(-)

1 0

[new][puppet] puppet-ovn 9.2.0 release (newton)
by no-reply＠openstack.org 29 Aug '16

29 Aug '16

We are grateful to announce the release of: puppet-ovn 9.2.0: Puppet module for OVN This release is part of the newton release series. For more details, please see below. Changes in puppet-ovn 9.1.0..9.2.0 ---------------------------------- 57ce569 Prepare 9.2.0 (newton b3) bd2ecdb Move other-requirements.txt to bindep.txt 9af1e4d Include openstacklib defaults manifest. Diffstat (except docs and test files) ------------------------------------- bindep.txt | 0 manifests/params.pp | 1 + metadata.json | 2 +- other-requirements.txt | 0 releasenotes/source/conf.py | 4 ++-- 5 files changed, 4 insertions(+), 3 deletions(-)

1 0

[new][openstackansible] openstack-ansible-security 12.2.2 release
by no-reply＠openstack.org 29 Aug '16

29 Aug '16

We are mirthful to announce the release of: openstack-ansible-security 12.2.2: Security hardening role for openstack-ansible For more details, please see below. Changes in openstack-ansible-security 12.2.0..12.2.2 ---------------------------------------------------- 6826bcc Fix duplicated config options in auditd.conf Diffstat (except docs and test files) ------------------------------------- tasks/auditd.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[new][puppet] puppet-openstacklib 9.2.0 release (newton)
by no-reply＠openstack.org 29 Aug '16

29 Aug '16

We are psyched to announce the release of: puppet-openstacklib 9.2.0: Puppet module for OpenStack Openstacklib This release is part of the newton release series. For more details, please see below. 9.2.0 ^^^^^ New Features * Add the ability to transform values in config files. This allows operators to configure input directly at assignment by specifying a 'transform_to' attribute. Changes in puppet-openstacklib 9.1.0..9.2.0 ------------------------------------------- 7c889ec Prepare 9.2.0 (newton b3) 4104513 Move other-requirements.txt to bindep.txt 72150f2 Add missing namevar method to openstack_config provider f1fe244 Add doc for openstack_config provider. 2075930 Add a way for provider to transform value in config. c628427 Increase command_timeout for openstackclient commands f37a0a3 service validation: log output on failures 1bba29e Fix postgresql 5aaaff5 Add optional params for idempotency in service_validation b61adb6 Make Apache vhost respect X-Forwarded-Proto header Diffstat (except docs and test files) ------------------------------------- README.md | 55 ++++++++++++++++++++++ bindep.txt | 0 lib/puppet/provider/openstack.rb | 4 +- .../provider/openstack_config/ini_setting.rb | 40 ++++++++++++++++ lib/puppet/provider/openstack_config/ruby.rb | 4 ++ manifests/service_validation.pp | 18 +++++++ manifests/wsgi/apache.pp | 1 + metadata.json | 4 +- other-requirements.txt | 0 .../notes/feature_add_transform_for_config.yaml | 5 ++ releasenotes/source/conf.py | 4 +- .../openstacklib_service_validation_spec.rb | 41 ++++++++++++++++ spec/defines/openstacklib_wsgi_apache_spec.rb | 3 +- .../provider/openstack_config/ini_setting_spec.rb | 46 +++++++++++++++++- spec/unit/provider/openstack_spec.rb | 2 +- 15 files changed, 218 insertions(+), 9 deletions(-)

1 0

[new][puppet] puppet-openstack_extras 9.2.0 release (newton)
by no-reply＠openstack.org 29 Aug '16

29 Aug '16

We are glowing to announce the release of: puppet-openstack_extras 9.2.0: Puppet module for OpenStack Openstack_extras This release is part of the newton release series. For more details, please see below. Changes in puppet-openstack_extras 9.1.0..9.2.0 ----------------------------------------------- 39c1ab2 Prepare 9.2.0 (newton b3) 9fac482 Move other-requirements.txt to bindep.txt 923e974 Fix metadata Diffstat (except docs and test files) ------------------------------------- bindep.txt | 0 metadata.json | 6 +++--- other-requirements.txt | 0 releasenotes/source/conf.py | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-)

1 0

[new][puppet] puppet-nova 9.2.0 release (newton)
by no-reply＠openstack.org 29 Aug '16

29 Aug '16

We are overjoyed to announce the release of: puppet-nova 9.2.0: Puppet module for OpenStack Nova This release is part of the newton release series. For more details, please see below. 9.2.0 ^^^^^ New Features ************ * Adds support to configure the new vendordata plugins for nova. * Configure keystonemiddleware in a consistent way with all options required for Keystone v3. * Allow to configure Key Manager api class parameter to communicate with Barbican. If Barbican is enabled, cryptsetup will be deployed on compute nodes. Upgrade Notes ************* * Add MultiStrOpt for scheduler_available_filters parameter. Deprecation Notes ***************** * nova::api::admin_tenant_name is deprecated in favor of nova::keystone::authtoken::project_name. * nova::api::admin_user is deprecated in favor of nova::keystone::authtoken::username. * nova::api::admin_password is deprecated in favor of nova::keystone::authtoken::password. * nova::api::identity_uri is deprecated in favor of nova::keystone::authtoken::auth_url. * nova::api::auth_version is deprecated in favor of nova::keystone::authtoken::auth_version * nova::api::auth_uri is deprecated in favor of nova::keystone::authtoken::auth_uri * nova::memcached_servers is deprecated in favor of nova::keystone::authtoken::memcached_servers. * The cells.driver configuration option is now deprecated and will be removed at Ocata cycle. * The following parameters moved from ::nova::scheduler::filter to ::nova so they can be configured at top level - cpu_allocation_ratio, ram_allocation_ratio and disk_allocation_ratio * quota_driver parameter was deprecated in Nova, so we also deprecate it in puppet-nova. * The 'manager' option in [cells] group was deprecated in Mitaka and now it is removed completely in newton. There is no impact. * The security_group_api option that was deprecated in Mitaka has been removed in Newton. Bug Fixes ********* * Fix vmware section name, should be vmware and not VMWARE. * Add missing insecure, ca_file and datastore_regex parameters Changes in puppet-nova 9.1.0..9.2.0 ----------------------------------- d2a2df6 Prepare 9.2.0 (newton b3) 0561339 Remove unneeded include for main class 3b598da Add support for new vendordata plugins 682e67a Remove manager option d25cd88 Remove security_group_api option 5075d8b Fix vmware manifest 94a6343 Move nova to authtoken b94f0a0 Move other-requirements.txt to bindep.txt a2794ea Update virsh secret if rbd_keyring or libvirt_rbd_secret_uuid change e7fe8c1 Add MultiStrOpt for scheduler_available_filters 9cb4b95 Fix typo in tests 866699f Allow the vcpu_pin_set to be configurable 0391f2c api: add missing options for nova-api c5c19ae compute: add missing options for Barbican f4f3921 compute: update doc for keymgr api_class c3f1986 set allocation ratios at top level e93fb51 Deprecate quota_driver d5ee773 remove osapi_v3 from acceptance 81f7d54 Enable Key Manager service (Barbican) parameter a75d97a Include openstacklib defaults manifest. f17471f Remove 12.04 and add 16.04 to metadata 61bf070 scheduler/filter: use os_service_default for arrays a323002 Mend nova_service provider 9e35da6 Deprecate driver option Diffstat (except docs and test files) ------------------------------------- bindep.txt | 0 lib/puppet/provider/nova.rb | 31 ++- lib/puppet/provider/nova_config/ini_setting.rb | 10 - lib/puppet/provider/nova_config/openstackconfig.rb | 10 + lib/puppet/provider/nova_service/openstack.rb | 4 +- lib/puppet/type/nova_aggregate.rb | 2 +- lib/puppet/type/nova_config.rb | 12 +- lib/puppet/type/nova_flavor.rb | 2 +- lib/puppet/type/nova_service.rb | 9 +- manifests/api.pp | 286 ++++++++++++++------- manifests/cells.pp | 17 +- manifests/compute.pp | 41 ++- manifests/compute/rbd.pp | 4 +- manifests/compute/vmware.pp | 59 +++-- manifests/init.pp | 45 +++- manifests/keystone/authtoken.pp | 275 ++++++++++++++++++++ manifests/network/neutron.pp | 9 - manifests/params.pp | 1 + manifests/quota.pp | 13 +- manifests/scheduler/filter.pp | 153 ++++++----- metadata.json | 14 +- other-requirements.txt | 0 ...vendordata-plugin-support-6880c73c27c87d74.yaml | 3 + ...heduler_available_filters-dc4b95337739526e.yaml | 3 + releasenotes/notes/authtoken-049381ec171680e4.yaml | 11 + releasenotes/notes/barbican-356c86ac7a7a327c.yaml | 4 + ...ecate_cells_driver_option-3412a439fd137186.yaml | 4 + ...duler-ratios-to-top-level-76c6383d828e6d4a.yaml | 5 + releasenotes/notes/quota-15b9ac2502b3c7c9.yaml | 3 + ...ated_cells_manager_option-1a32b6e1c01d2958.yaml | 4 + ...remove_security_group_api-31ecb1a375826d92.yaml | 4 + .../notes/vmware_updates-9ead09cc33383d5f.yaml | 4 + releasenotes/source/conf.py | 4 +- spec/acceptance/nova_wsgi_apache_spec.rb | 6 +- spec/classes/nova_api_spec.rb | 71 ++--- spec/classes/nova_cells_spec.rb | 3 - spec/classes/nova_compute_libvirt_spec.rb | 2 +- spec/classes/nova_compute_rbd_spec.rb | 4 +- spec/classes/nova_compute_spec.rb | 28 ++ spec/classes/nova_compute_vmware_spec.rb | 65 +++-- spec/classes/nova_init_spec.rb | 23 +- spec/classes/nova_keystone_authtoken_spec.rb | 147 +++++++++++ spec/classes/nova_quota_spec.rb | 3 +- spec/classes/nova_scheduler_filter_spec.rb | 92 +++++-- spec/unit/provider/nova_config/ini_setting_spec.rb | 68 ----- .../provider/nova_config/openstackconfig_spec.rb | 68 +++++ spec/unit/provider/nova_spec.rb | 14 +- spec/unit/type/nova_config_spec.rb | 4 +- 48 files changed, 1215 insertions(+), 429 deletions(-)

1 0