You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by ro...@apache.org on 2014/12/11 02:37:34 UTC

[1/2] incubator-usergrid git commit: changed calcTimeDiff to actually return seconds

Repository: incubator-usergrid
Updated Branches:
  refs/heads/master dd636edad -> 127df0397


changed calcTimeDiff to actually return seconds


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/aca5822c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/aca5822c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/aca5822c

Branch: refs/heads/master
Commit: aca5822c602d72cd1f2adf27ecfdaec6fd45c1c6
Parents: 55e817c
Author: Erich Buri <er...@gmail.com>
Authored: Wed Nov 19 17:58:22 2014 +0100
Committer: Erich Buri <er...@gmail.com>
Committed: Wed Nov 19 17:58:22 2014 +0100

----------------------------------------------------------------------
 sdks/nodejs/lib/usergrid.js | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/aca5822c/sdks/nodejs/lib/usergrid.js
----------------------------------------------------------------------
diff --git a/sdks/nodejs/lib/usergrid.js b/sdks/nodejs/lib/usergrid.js
index 284deee..5a85274 100755
--- a/sdks/nodejs/lib/usergrid.js
+++ b/sdks/nodejs/lib/usergrid.js
@@ -467,12 +467,8 @@ var AUTH_NONE = 'NONE';
   *  A private method to get call timing of last call
   */
   Usergrid.Client.prototype.calcTimeDiff = function () {
-   var seconds = 0;
    var time = this._end - this._start;
-   try {
-      seconds = ((time/10) / 60).toFixed(2);
-   } catch(e) { return 0; }
-   return seconds;
+   return (time/1000).toFixed(2);
   }
 
   /*


[2/2] incubator-usergrid git commit: Merge remote-tracking branch 'eburi/sdk/nodejs/calc-time-fix' into apache_usergrid/master

Posted by ro...@apache.org.
Merge remote-tracking branch 'eburi/sdk/nodejs/calc-time-fix' into apache_usergrid/master


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/127df039
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/127df039
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/127df039

Branch: refs/heads/master
Commit: 127df0397de4ce55ab5afcfbc8f05043b764c450
Parents: dd636ed aca5822
Author: Rod Simpson <ro...@apigee.com>
Authored: Wed Dec 10 18:37:17 2014 -0700
Committer: Rod Simpson <ro...@apigee.com>
Committed: Wed Dec 10 18:37:17 2014 -0700

----------------------------------------------------------------------
 sdks/nodejs/lib/usergrid.js | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)
----------------------------------------------------------------------