From b7a60b53b22851bcc09ca1a418c7b16c6c7ce1f7 Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" Date: Thu, 25 Apr 2013 08:57:44 -0700 Subject: [PATCH] Update documentation for Chef 11.4.4. Update Gemfile for vagrant 1.2.2 --- Gemfile | 2 +- Gemfile.lock | 6 +++--- README.md | 36 ++++++++++++++++++++++++++---------- 3 files changed, 30 insertions(+), 14 deletions(-) diff --git a/Gemfile b/Gemfile index 615881491..1eb8eab88 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source "https://rubygems.org" -gem "vagrant", :git => 'https://github.com/mitchellh/vagrant.git', :tag => 'v1.1.5' +gem "vagrant", :git => 'https://github.com/mitchellh/vagrant.git', :tag => 'v1.2.2' gem "veewee", :git => 'https://github.com/jedi4ever/veewee.git', :ref => '164a10dd24' gem "vagrant-windows", :git => 'https://github.com/sneal/vagrant-windows.git', :branch => 'vagrant-1.1-plugin-architecture-vbox4.1' # mainline vagrant-windows isn't working yet with Vagrant 1.1 gem "em-winrm" # for windows! diff --git a/Gemfile.lock b/Gemfile.lock index cd7aa7654..8664c621d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -20,10 +20,10 @@ GIT GIT remote: https://github.com/mitchellh/vagrant.git - revision: 64e360814c3ad960d810456add977fd4c7d47ce6 - tag: v1.1.5 + revision: 7e400d00a3c5a0fdf2809c8b5001a035415a607b + tag: v1.2.2 specs: - vagrant (1.1.5) + vagrant (1.2.2) childprocess (~> 0.3.7) erubis (~> 2.7.0) i18n (~> 0.6.0) diff --git a/README.md b/README.md index 4e453907e..2f399d336 100644 --- a/README.md +++ b/README.md @@ -11,33 +11,49 @@ make "Don't Repeat Yourself" (DRY) modular baseboxes. Thanks Tim! ## Current Baseboxes The following baseboxes are publicly available and were built using -this project, and Chef 11.4.0. Future releases of Chef and baseboxes +this project, and Chef 11.4.4. Future releases of Chef and baseboxes will follow the naming convention used here: opscode_PLATFORM-VERSION_chef-VERSION.box -And located in the opscode-vm S3 bucket's vagrant directory as linked +and located in the opscode-vm S3 bucket's vagrant directory as linked below. 64-bit boxes: +* [opscode-centos-5.9](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_centos-5.9_chef-11.4.4.box) +* [opscode-centos-6.4](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_centos-6.4_chef-11.4.4.box) +* [opscode-ubuntu-10.04](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_ubuntu-10.04_chef-11.4.4.box) +* [opscode-ubuntu-12.04](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_ubuntu-12.04_chef-11.4.4.box) + +32-bit boxes: + +* [opscode-centos-5.9-i386](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_centos-5.9-i386_chef-11.4.4.box) +* [opscode-centos-6.4-i386](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_centos-6.4-i386_chef-11.4.4.box) +* [opscode-ubuntu-10.04-i386](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_ubuntu-10.04-i386_chef-11.4.4.box) +* [opscode-ubuntu-12.04-i386](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_ubuntu-12.04-i386_chef-11.4.4.box) + +## Older Baseboxes + +The following base boxes were built with Chef 11.4.0. + +64-bit boxes: + * [opscode-centos-5.9](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_centos-5.9_chef-11.4.0.box) * [opscode-centos-6.4](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_centos-6.4_chef-11.4.0.box) -* [opscode-ubuntu-10.04](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_ubuntu-10.04_chef-11.2.0.box) -* [opscode-ubuntu-12.04](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_ubuntu-12.04_chef-11.2.0.box) +* [opscode-ubuntu-10.04](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_ubuntu-10.04_chef-11.4.0.box) +* [opscode-ubuntu-12.04](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_ubuntu-12.04_chef-11.4.0.box) 32-bit boxes: * [opscode-centos-5.9-i386](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_centos-5.9-i386_chef-11.4.0.box) * [opscode-centos-6.4-i386](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_centos-6.4-i386_chef-11.4.0.box) -* [opscode-ubuntu-10.04-i386](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_ubuntu-10.04-i386_chef-11.2.0.box) -* [opscode-ubuntu-12.04-i386](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_ubuntu-12.04-i386_chef-11.2.0.box) - -## Older Baseboxes +* [opscode-ubuntu-10.04-i386](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_ubuntu-10.04-i386_chef-11.4.0.box) +* [opscode-ubuntu-12.04-i386](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_ubuntu-12.04-i386_chef-11.4.0.box) -The following base boxes were built with Chef 11.2.0. +The following base boxes were built with Chef 11.2.0. (No 32-bit boxes were built for Chef 11.2.0.) -* [opscode-centos-5.8](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_centos-5.8_chef-11.4.0.box) +* [opscode-centos-5.8](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_centos-5.8_chef-11.2.0.box) * [opscode-centos-6.3](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_centos-6.3_chef-11.2.0.box) * [opscode-ubuntu-10.04](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_ubuntu-10.04_chef-11.2.0.box) * [opscode-ubuntu-12.04](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_ubuntu-12.04_chef-11.2.0.box)