Download as
Browse Code »

Commit ee211922384ae86bb01ab2e62ace66198ff34ba4

Authored by Sergio Oliveira
2 parents a17fd863 c8fcf6d2
Exists in master and in 64 other branches 3.x, add_you_are_here_breadcrumbs_label, api_for_colab, backup_not_prod, cdtc_configuration, create_institution_bootstrap_modal, design_validation, dev-lappis, dev_env_minimal, disable_email_dev, docs, fix_edit_software_permission, fix_edit_software_with_another_license, fix_hover_button_whitening, fix_members_pagination, fix_models_translations, fix_software_api, fix_software_block_migration, fix_validations_and_tests, focus_search_field_theme, gov-user-refactoring, gov-user-refactoring-rails4, header_fix, institution_modal_on_rating, kalibro-conf-refactoring, kalibro-processor-package, lxc, margin_fix, mezuro_cookbook, organization_rating_style_changes, performance, prezento, r3, refactor_software_communities, refactor_software_for_sisp, register_page, release-process, release-process-v2, remove-unused-images, remove_backup_emails, remove_secondary_email_from_user, removing_super_archives_email, review_message, scope2method, signals_community_noosfero, sisp_colab_config, sisp_dev, sisp_dev_master, sisp_improvements, sisp_simple_version, software_as_organization, software_catalog_style_fix, software_catalog_style_fixes, spb_minimal_env, spec_refactor, stable-4.x, stable-devel, support_docs, syslog, temp_soft_comm_refactoring, thread_dropdown, thread_page, update_software_api, update_softwares_boxes

Merge remote-tracking branch 'origin' into fix_external_firewall

Showing 1 changed file with 1 additions and 1 deletions   Show diff stats
@@ -7,7 +7,7 @@ require 'yaml' @@ -7,7 +7,7 @@ require 'yaml'
7 VAGRANTFILE_API_VERSION = "2" 7 VAGRANTFILE_API_VERSION = "2"
8 8
9 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| 9 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
10 - config.vm.box = ENV.fetch("VAGRANT_BOX", 'centos7') 10 + config.vm.box = ENV.fetch("VAGRANT_BOX", 'chef/centos-7.0')
11 proxy = ENV['http_proxy'] || ENV['HTTP_PROXY'] 11 proxy = ENV['http_proxy'] || ENV['HTTP_PROXY']
12 if proxy 12 if proxy
13 config.vm.provision 'shell', path: 'utils/proxy.sh', args: [proxy] 13 config.vm.provision 'shell', path: 'utils/proxy.sh', args: [proxy]