diff mbox

[Branch,~linaro-validation/lava-dashboard/trunk] Rev 419: lava-dashboard-tool -> lava-tool

Message ID 20130905160728.19341.26845.launchpad@ackee.canonical.com
State Accepted
Headers show

Commit Message

Tyler Baker Sept. 5, 2013, 4:07 p.m. UTC 
Merge authors:
  Tyler Baker (tyler-baker)
Related merge proposals:
  https://code.launchpad.net/~tyler-baker/lava-dashboard/lava-tool-update/+merge/183927
  proposed by: Tyler Baker (tyler-baker)
  review: Approve - Antonio Terceiro (terceiro)
------------------------------------------------------------
revno: 419 [merge]
committer: Tyler Baker <tyler.baker@linaro.org>
branch nick: lava-dashboard
timestamp: Thu 2013-09-05 09:07:03 -0700
message:
  lava-dashboard-tool -> lava-tool
modified:
  dashboard_app/templates/dashboard_app/bundle_detail.html
  dashboard_app/templates/dashboard_app/data_view_list.html
  setup-dev-env.sh


--
lp:lava-dashboard
https://code.launchpad.net/~linaro-validation/lava-dashboard/trunk

You are subscribed to branch lp:lava-dashboard.
To unsubscribe from this branch go to https://code.launchpad.net/~linaro-validation/lava-dashboard/trunk/+edit-subscription
diff mbox

Patch

=== modified file 'dashboard_app/templates/dashboard_app/bundle_detail.html'
--- dashboard_app/templates/dashboard_app/bundle_detail.html	2013-02-25 04:52:22 +0000
+++ dashboard_app/templates/dashboard_app/bundle_detail.html	2013-09-04 16:43:10 +0000
@@ -59,9 +59,9 @@ 
 <p>You can download this bundle with the following command:</p>
 <div class="console">
 {% if bundle.private %}
-  <code>lava-dashboard-tool get --dashboard-url=http://{{request.user.username}}@{{site.domain}}{% url lava.api_handler %} {{bundle.content_sha1}}</code>
+  <code>lava-tool get --dashboard-url=http://{{request.user.username}}@{{site.domain}}{% url lava.api_handler %} {{bundle.content_sha1}}</code>
 {% else %}
-  <code>lava-dashboard-tool get --dashboard-url=http://{{site.domain}}{% url lava.api_handler %} {{bundle.content_sha1}}</code>
+  <code>lava-tool get --dashboard-url=http://{{site.domain}}{% url lava.api_handler %} {{bundle.content_sha1}}</code>
 {% endif %}
 </div>
 {% endblock %}

=== modified file 'dashboard_app/templates/dashboard_app/data_view_list.html'
--- dashboard_app/templates/dashboard_app/data_view_list.html	2011-07-22 00:17:19 +0000
+++ dashboard_app/templates/dashboard_app/data_view_list.html	2013-09-04 16:43:10 +0000
@@ -9,8 +9,8 @@ 
       class="ui-icon ui-icon-info"
       style="float: left; margin-right: 0.3em;"></span>
     <strong>Hint:</strong> To call a data view use the
-    <code>lava-dashboard-tool</code> command. See 
-    <code>lava-dashboard-tool query-data-view --help</code>
+    <code>lava-tool</code> command. See 
+    <code>lava-tool query-data-view --help</code>
     to get started.
   </div>
 </div>

=== modified file 'setup-dev-env.sh'
--- setup-dev-env.sh	2011-09-30 23:45:49 +0000
+++ setup-dev-env.sh	2013-09-04 16:43:10 +0000
@@ -11,7 +11,7 @@ 
         PORT=8000
     fi
 fi
-# Setup dashboard URL for lava-dashboard-tool
+# Setup dashboard URL for lava-tool
 export DASHBOARD_URL=http://localhost:$PORT/dashboard
 # Find root directory
 ROOT="$(bzr root)"
@@ -69,18 +69,18 @@ 
     echo " * waiting for server to start up"
     sleep 5
     echo " * creating bundle stream for example data" 
-    lava-dashboard-tool make-stream /anonymous/examples/ --name "Demo content loaded from examples/bundles"
+    lava-tool make-stream /anonymous/examples/ --name "Demo content loaded from examples/bundles"
     for BUNDLE_PATHNAME in $ROOT/examples/bundles/*.json; do
         BUNDLE=$(basename $BUNDLE_PATHNAME .json)
         echo " * importing bundle: $BUNDLE"
-        lava-dashboard-tool put $BUNDLE_PATHNAME >/dev/null
+        lava-tool put $BUNDLE_PATHNAME >/dev/null
     done
     for BUNDLE_PATHNAME in $ROOT/examples/bundles/templates/*.json; do
         BUNDLE=$(basename $BUNDLE_PATHNAME .json)
         echo " * importing bundle template: $BUNDLE"
         for i in $(seq 1 20); do
             sed "$BUNDLE_PATHNAME" -e "s!@TEMPLATE@!$(printf %04d $i)!g" > "$i-$BUNDLE"
-            lava-dashboard-tool put "$i-$BUNDLE" /anonymous/examples/ >/dev/null
+            lava-tool put "$i-$BUNDLE" /anonymous/examples/ >/dev/null
             rm -f "$i-$BUNDLE"
         done
     done