51c27c9638ff0990c5f904c815b9e40cf7acc146: Merge m-c to s-c.
Richard Newman <rnewman@mozilla.com> - Thu, 04 Oct 2012 11:00:48 -0700 - rev 110975
Push 23725 by rnewman@mozilla.com at Mon, 22 Oct 2012 19:47:10 +0000
Merge m-c to s-c.
7e9d2d39d6ede5f14c7f9773e5df39fbc672fa2c: Merge m-c to s-c.
Richard Newman <rnewman@mozilla.com> - Thu, 04 Oct 2012 07:34:14 -0700 - rev 110974
Push 23725 by rnewman@mozilla.com at Mon, 22 Oct 2012 19:47:10 +0000
Merge m-c to s-c.
baffb4084bbddc5bf15ad67385a6a8fc522b7099: Merge m-c to s-c.
Richard Newman <rnewman@mozilla.com> - Wed, 03 Oct 2012 23:43:39 -0700 - rev 110973
Push 23725 by rnewman@mozilla.com at Mon, 22 Oct 2012 19:47:10 +0000
Merge m-c to s-c.
8d1ffa2548af2bb99e74add6c78297610edf4cd0: Merge m-c to s-c.
Richard Newman <rnewman@mozilla.com> - Mon, 01 Oct 2012 22:28:32 -0700 - rev 110972
Push 23725 by rnewman@mozilla.com at Mon, 22 Oct 2012 19:47:10 +0000
Merge m-c to s-c.
4b4828e5a3f02f0df6acc8eec541209c572fb4ff: Bug 790822: Make ensureMillisecondsTimestamp convert to integer. r=gps
Nick Alexander <nalexander@mozilla.com> - Sun, 30 Sep 2012 18:12:46 -0700 - rev 110971
Push 23725 by rnewman@mozilla.com at Mon, 22 Oct 2012 19:47:10 +0000
Bug 790822: Make ensureMillisecondsTimestamp convert to integer. r=gps
97d8345d7d23636a4fe4062c4fe2b7d2cbe19e2b: Merge m-c to s-c.
Richard Newman <rnewman@mozilla.com> - Sun, 30 Sep 2012 18:11:24 -0700 - rev 110970
Push 23725 by rnewman@mozilla.com at Mon, 22 Oct 2012 19:47:10 +0000
Merge m-c to s-c.
ba6826b6b77d208b73a31c755f6ead50a9306750: Merge m-c to s-c.
Richard Newman <rnewman@mozilla.com> - Sat, 29 Sep 2012 00:59:43 -0700 - rev 110969
Push 23725 by rnewman@mozilla.com at Mon, 22 Oct 2012 19:47:10 +0000
Merge m-c to s-c.
ee8914230c0acf2338414a18ec57f83f5f66d093: Merge mozilla-central into services-central
Gregory Szorc <gps@mozilla.com> - Wed, 26 Sep 2012 17:00:19 -0700 - rev 110968
Push 23725 by rnewman@mozilla.com at Mon, 22 Oct 2012 19:47:10 +0000
Merge mozilla-central into services-central
2dd64ab621fc70fef90438a1497baf85ba41d5b1: Merge mozilla-central into services-central
Gregory Szorc <gps@mozilla.com> - Wed, 26 Sep 2012 09:56:41 -0700 - rev 110967
Push 23725 by rnewman@mozilla.com at Mon, 22 Oct 2012 19:47:10 +0000
Merge mozilla-central into services-central
01f2340b9b03595b11719e719de5fbcd16ac6e16: Merge m-c to s-c.
Richard Newman <rnewman@mozilla.com> - Wed, 26 Sep 2012 00:01:03 -0700 - rev 110966
Push 23725 by rnewman@mozilla.com at Mon, 22 Oct 2012 19:47:10 +0000
Merge m-c to s-c.
b28ad8a02ecb3f6fea66e3e895e2811a62fd9d6a: Merge mozilla-central into services-central
Gregory Szorc <gps@mozilla.com> - Tue, 25 Sep 2012 11:00:01 -0700 - rev 110965
Push 23725 by rnewman@mozilla.com at Mon, 22 Oct 2012 19:47:10 +0000
Merge mozilla-central into services-central
4a49a6f54e2304a1af2c740b0642b9e42c1aabfe: Bug 792546 - Part 5: Clean up excessive imports; r=rnewman
Gregory Szorc <gps@mozilla.com> - Mon, 24 Sep 2012 13:46:19 -0700 - rev 110964
Push 23725 by rnewman@mozilla.com at Mon, 22 Oct 2012 19:47:10 +0000
Bug 792546 - Part 5: Clean up excessive imports; r=rnewman
b85f209e6072102cb17c1841de1f956ee9f6a326: Bug 792546 - Part 4: Move utility functions to testing-only JS module; r=rnewman
Gregory Szorc <gps@mozilla.com> - Mon, 24 Sep 2012 13:45:49 -0700 - rev 110963
Push 23725 by rnewman@mozilla.com at Mon, 22 Oct 2012 19:47:10 +0000
Bug 792546 - Part 4: Move utility functions to testing-only JS module; r=rnewman
6fc02deb63dad3f73af99b488db40bf2dccb5880: Bug 792546 - Part 3: Move logging functions into standalone module; r=rnewman
Gregory Szorc <gps@mozilla.com> - Mon, 24 Sep 2012 13:43:02 -0700 - rev 110962
Push 23725 by rnewman@mozilla.com at Mon, 22 Oct 2012 19:47:10 +0000
Bug 792546 - Part 3: Move logging functions into standalone module; r=rnewman
da562c88998fd83cd62eebecbfdd900d159db25e: Bug 792546 - Part 2: Move fake services into testing-only JS module; r=rnewman
Gregory Szorc <gps@mozilla.com> - Mon, 24 Sep 2012 13:42:54 -0700 - rev 110961
Push 23725 by rnewman@mozilla.com at Mon, 22 Oct 2012 19:47:10 +0000
Bug 792546 - Part 2: Move fake services into testing-only JS module; r=rnewman We still import these functions in head.js. This will be cleaned up later once functionality from head.js that uses them is moved into a testing-only JS module.
234c791284378113405cf1dbb0744fe19e1b7f75: Bug 792546 - Part 1: Move rotary engine to a testing-only JS module; r=rnewman
Gregory Szorc <gps@mozilla.com> - Mon, 24 Sep 2012 13:42:31 -0700 - rev 110960
Push 23725 by rnewman@mozilla.com at Mon, 22 Oct 2012 19:47:10 +0000
Bug 792546 - Part 1: Move rotary engine to a testing-only JS module; r=rnewman
c9c1d7126858879fca53be667b1404c2b342c80b: Merge mozilla-central into services-central
Gregory Szorc <gps@mozilla.com> - Mon, 24 Sep 2012 13:33:43 -0700 - rev 110959
Push 23725 by rnewman@mozilla.com at Mon, 22 Oct 2012 19:47:10 +0000
Merge mozilla-central into services-central
9c064d735c2345e6473448f238485e928531288f: Merge mozilla-central into services-central
Gregory Szorc <gps@mozilla.com> - Fri, 21 Sep 2012 12:12:59 -0700 - rev 110958
Push 23725 by rnewman@mozilla.com at Mon, 22 Oct 2012 19:47:10 +0000
Merge mozilla-central into services-central
3e2c523a5c6fba13c2215e315c5498b71f2d103f: Bug 792990 - Properly handle add-ons when resetting Sync; r=rnewman
Gregory Szorc <gps@mozilla.com> - Fri, 21 Sep 2012 11:22:59 -0700 - rev 110957
Push 23725 by rnewman@mozilla.com at Mon, 22 Oct 2012 19:47:10 +0000
Bug 792990 - Properly handle add-ons when resetting Sync; r=rnewman Due to a bug in the add-on sync implementation, resetting Sync would cause all add-ons to be uninstalled and not replaced with the server data.
3c8a88b1c092c6fa38034b60a8adebebd1da187d: Merge m-c to s-c.
Richard Newman <rnewman@mozilla.com> - Fri, 21 Sep 2012 07:15:41 -0700 - rev 110956
Push 23725 by rnewman@mozilla.com at Mon, 22 Oct 2012 19:47:10 +0000
Merge m-c to s-c.
(0) -100000 -30000 -10000 -3000 -1000 -300 -100 -50 -20 +20 +50 +100 +300 +1000 +3000 +10000 +30000 +100000 +300000 tip