From 98c0f05b12bc1038835630a5b99b525b50ecd1d6 Mon Sep 17 00:00:00 2001 From: Jon Pugh Date: Tue, 28 Jun 2016 16:09:21 -0400 Subject: [PATCH 1/6] Bumping devmaster playbook to 1.1.4 Conflicts: roles.yml --- roles.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles.yml b/roles.yml index 11f0003e8b..60c578fb9f 100644 --- a/roles.yml +++ b/roles.yml @@ -19,4 +19,4 @@ version: 1.0.4 - name: opendevshop.devmaster - version: 1.1.3 + version: 1.1.4 From 1b4e7756700cc5f52f7bae0a621b2b0db9b8b7b3 Mon Sep 17 00:00:00 2001 From: Jon Pugh Date: Tue, 28 Jun 2016 18:28:10 -0400 Subject: [PATCH 2/6] bumping devmaster role to version master until we fix it --- roles.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/roles.yml b/roles.yml index 60c578fb9f..31df3757c7 100644 --- a/roles.yml +++ b/roles.yml @@ -19,4 +19,5 @@ version: 1.0.4 - name: opendevshop.devmaster - version: 1.1.4 +# version: 1.1.4 + version: master From 58f004350ecf9489eb8b07d86dada29687b3aa32 Mon Sep 17 00:00:00 2001 From: Jon Pugh Date: Tue, 28 Jun 2016 19:20:35 -0400 Subject: [PATCH 3/6] Pinning to devmaster role 1.1.5 --- roles.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/roles.yml b/roles.yml index 31df3757c7..6e8ee7f5e2 100644 --- a/roles.yml +++ b/roles.yml @@ -19,5 +19,4 @@ version: 1.0.4 - name: opendevshop.devmaster -# version: 1.1.4 - version: master + version: 1.1.5 From 82a7d0b4d6e32f51f0a07a0b079f7b64555bc121 Mon Sep 17 00:00:00 2001 From: Jon Pugh Date: Tue, 28 Jun 2016 19:24:07 -0400 Subject: [PATCH 4/6] More Changelog. --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2475d2180c..99ded2ead6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ # 1.0.0-beta9 (June 28, 2016) +- Bumped Drupal to 7.44, Hosting to 3.6, and Views to 3.14. - Added '--force' to 'git submodule' updates on deploy. - Adding local copies of bootstrap js and css so devshop can work offline. - Replaced "\n" with actual new lines in ASCII output. @@ -12,11 +13,11 @@ - Add an argument to devshop_drush_process() to be able to skip logging the output. - Verify Project is triggered after environment create to ensure metadata is present. - Decided to remove the code that skips running deploy hooks if there are "no changes detected". -- Bumped Drupal to 7.44, Hosting to 3.6, and Views to 3.14. - DevMaster Playbook fixes: - Fixed the automatic setting of the aegir public ssh key variable. - Adding back SSH key privacy settings, git config, and drush cache clearing. - Fixed typos in yml tasks. + - Fixed a terrible bug that broke installation: Clear Drush Caches! - Bumped up default vagrant VM memory to 4GB. # 1.0.0-beta8 (June 15, 2016) From f942b2607927ebc65974e351a52e7d54d3b8dd40 Mon Sep 17 00:00:00 2001 From: Jon Pugh Date: Tue, 28 Jun 2016 19:25:54 -0400 Subject: [PATCH 5/6] Fixing link to versions. --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 99ded2ead6..838f8684a8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,9 +22,9 @@ # 1.0.0-beta8 (June 15, 2016) -1 commit to DevShop: https://github.com/opendevshop/devshop/compare/1.0.0-beta7...1.x +1 commit to DevShop: https://github.com/opendevshop/devshop/compare/1.0.0-beta7...1.0.0-beta8 -29 commit to DevMaster: https://github.com/opendevshop/devmaster/compare/1.0.0-beta7...1.x +29 commit to DevMaster: https://github.com/opendevshop/devmaster/compare/1.0.0-beta7...1.0.0-beta8 - Fixed script to launch devshop in docker containers for development. - Fixed numerous problems with DevShop Testing module preventing fully automated testing. From 4263120a55e9f89332932de84566eac51c3f5c9e Mon Sep 17 00:00:00 2001 From: Jon Pugh Date: Tue, 28 Jun 2016 19:28:24 -0400 Subject: [PATCH 6/6] More Changelog. --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 838f8684a8..5de1c1b2b2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ # 1.0.0-beta9 (June 28, 2016) + 11 commits to DevShop: https://github.com/opendevshop/devshop/compare/1.0.0-beta8...1.0.0-beta9 + + 12 commits to Devmaster: https://github.com/opendevshop/devmaster/compare/1.0.0-beta8...1.0.0-beta9 + - Bumped Drupal to 7.44, Hosting to 3.6, and Views to 3.14. - Added '--force' to 'git submodule' updates on deploy. - Adding local copies of bootstrap js and css so devshop can work offline.