Skip to content

Commit

Permalink
Merge branch 'master' into afiune/552/software-definition/chef-analyze
Browse files Browse the repository at this point in the history
  • Loading branch information
Salim Afiune authored Oct 2, 2019
2 parents 772e68e + 49d6e86 commit 3b45cc7
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 8 deletions.
7 changes: 4 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
<!-- usage documentation: https://expeditor.chef.io/docs/reference/changelog/ -->
<!-- latest_release 0.10.7 -->
## [0.10.7](https://github.com/chef/chef-workstation/tree/0.10.7) (2019-10-02)
<!-- latest_release 0.10.8 -->
## [0.10.8](https://github.com/chef/chef-workstation/tree/0.10.8) (2019-10-02)

#### Merged Pull Requests
- Update new chef-cli binary [#551](https://github.com/chef/chef-workstation/pull/551) ([afiune](https://github.com/afiune))
- Stop calling the workstation toolbar experimental [#491](https://github.com/chef/chef-workstation/pull/491) ([tas50](https://github.com/tas50))
<!-- latest_release -->

<!-- release_rollup since=0.9.42 -->
### Changes since 0.9.42 release

#### Merged Pull Requests
- Stop calling the workstation toolbar experimental [#491](https://github.com/chef/chef-workstation/pull/491) ([tas50](https://github.com/tas50)) <!-- 0.10.8 -->
- Update new chef-cli binary [#551](https://github.com/chef/chef-workstation/pull/551) ([afiune](https://github.com/afiune)) <!-- 0.10.7 -->
- Updates omnibus-software to have Go [#554](https://github.com/chef/chef-workstation/pull/554) ([afiune](https://github.com/afiune)) <!-- 0.10.6 -->
- Bump inspec to 4.17.15 [#549](https://github.com/chef/chef-workstation/pull/549) ([chef-expeditor[bot]](https://github.com/chef-expeditor[bot])) <!-- 0.10.5 -->
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.10.7
0.10.8
4 changes: 2 additions & 2 deletions omnibus/package-scripts/chef-workstation/postinst
Original file line number Diff line number Diff line change
Expand Up @@ -68,15 +68,15 @@ else # linux - postinst does not run for windows.
# 0 rc means grep found 'not found' text - and we have missing deps.
if [ $? -eq 0 ]; then
echo ""
echo "To run the experimental Chef Workstation App, use your"
echo "To run the Chef Workstation App, use your"
echo "platform's package manager to install these dependencies:"
echo ""
ldd "$cwa_app_path" | grep "not found" 2>&1
echo "You can then launch the App by running 'chef-workstation-app'."
echo "The App will then be available in the system tray."
else
echo ""
echo "The experimental Chef Workstation App is available for you to try."
echo "The Chef Workstation App is available for you to try."
echo ""
echo "Launch the App by running 'chef-workstation-app'."
echo "The App will then be available in the system tray."
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<String Id="ChefWSPowershellShortcutDefName">CW PowerShell</String>
<String Id="ChefWSPowershellShortcutDefDesc">A PowerShell prompt pre-configured to allow you to work with <%= friendly_name %>'s included suite of tools.</String>

<String Id="ChefWSAppShortcutName">CW App [Experimental]</String>
<String Id="ChefWSAppShortcutName">CW App</String>
<String Id="ChefWSAppShortcutDesc">Manage <%= friendly_name %> preferences, feedback, and updates.</String>

<String Id="FeatureChefWSStartMenuPSShortcut">Start Menu PowerShell Shortcut</String>
Expand Down
2 changes: 1 addition & 1 deletion omnibus/resources/chef-workstation/pkg/welcome.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Including:
<ul>
<li><strong>chef-run:</strong> Ad-hoc remote execution of Chef</li>
<li><strong>ChefDK:</strong> Tools for local Chef Development</li>
<li><strong>Chef Workstation App:</strong> Experimental menu bar application</li>
<li><strong>Chef Workstation App:</strong> Chef's menu bar application</li>
</ul>
<br>
For more information please visit: <a href="https://chef.sh">https://chef.sh</a>.
Expand Down

0 comments on commit 3b45cc7

Please sign in to comment.