Merge branch 'dev'

* dev: v0.9.4
TheNewNormal · Aug 1, 2015 · 1698533 · 1698533
2 parents a957dc6 + 1abbca6
commit 1698533
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/CoreOS GUI/CoreOS GUI-Info.plist b/src/CoreOS GUI/CoreOS GUI-Info.plist
@@ -19,11 +19,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.9.3</string>
+	<string>0.9.4</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>391</string>
+	<string>393</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>

diff --git a/src/fleet/fleet-ui.service b/src/fleet/fleet-ui.service
@@ -9,7 +9,7 @@ TimeoutStartSec=0
 EnvironmentFile=/etc/environment
 ExecStartPre=/usr/bin/docker pull purpleworks/fleet-ui:latest
 ExecStartPre=-/usr/bin/docker rm fleet_ui
-ExecStart=/usr/bin/docker run --rm --name fleet_ui --memory="128m" --cpu-shares=1 \
+ExecStart=/usr/bin/docker run --rm --name fleet_ui --memory="128m" \
  -p 3000:3000 \
  -e ETCD_PEER=172.17.42.1 \
  -v /home/core/.ssh/id_rsa:/root/id_rsa \