move callbackAggregator from iaas/upload 2 levels above

lib/cli/commands/cert.js

@@ -17,7 +17,7 @@
 var fs = require('fs');
 var azure = require('../../azure');
 var utils = require('../utils');
-var cagg = require('../iaas/upload/callbackAggregator');
+var cagg = require('../callbackAggregator');
 
 exports.init = function (cli) {
   var vm = cli.category('cert')

lib/cli/iaas/upload/blobInfo.js

@@ -25,7 +25,7 @@
  *
  */
 
-var callbackAggregator = require('./callbackAggregator');
+var callbackAggregator = require('../../callbackAggregator');
 var intSet = require('./intSet');
 var bufferStream = require('./bufferStream');
 

lib/cli/iaas/upload/pageBlob.js

@@ -31,7 +31,7 @@ var azure = require('../../../azure');
 var jobTracker = require('./jobTracker');
 var intSet = require('./intSet');
 var blobInfo = require('./blobInfo');
-var callbackAggregator = require('./callbackAggregator');
+var callbackAggregator = require('../../callbackAggregator');
 
 var blobUtils = require('../../blobUtils');
 var splitDestinationUri = blobUtils.splitDestinationUri;

lib/cli/iaas/upload/uploadVMImage.js

@@ -21,7 +21,7 @@ var util = require('util');
 var qs = require('querystring');
 var pageBlob = require('./pageBlob');
 var blobUtils = require('../../blobUtils');
-var callbackAggregator = require('./callbackAggregator');
+var callbackAggregator = require('../../callbackAggregator');
 
 // get account info: account key and blob endpoint
 // callback: function(error, primaryKey, destUri)