• Tristan Cavelier's avatar
    Merge remote-tracking branch 's3/master' into s3storage · fd52a421
    Tristan Cavelier authored
    Conflicts:
    	Gruntfile.js
    	Makefile
    	README.md
    	complex_queries.js
    	examples/example.html
    	examples/jio_dashboard.html
    	jio.js
    	package.json
    	src/jio.storage/cryptstorage.js
    	src/jio.storage/davstorage.js
    	src/jio.storage/erp5storage.js
    	src/jio.storage/gidstorage.js
    	src/jio.storage/indexstorage.js
    	src/jio.storage/localstorage.js
    	src/jio.storage/replicaterevisionstorage.js
    	src/jio.storage/replicatestorage.js
    	src/jio.storage/revisionstorage.js
    	src/jio.storage/s3storage.js
    	src/jio.storage/xwikistorage.js
    	src/jio/core/globals.js
    	src/jio/core/restCommandRejecter.js
    	src/jio/core/restCommandResolver.js
    	src/jio/core/util.js
    	src/jio/features/jobChecker.js
    	src/jio/features/jobExecuter.js
    	src/jio/features/jobQueue.js
    	src/jio/features/jobRetry.js
    	src/jio/intro.js
    	test/jio.storage/davstorage.tests.js
    	test/jio.storage/gidstorage.tests.js
    	test/jio.storage/indexstorage.tests.js
    	test/jio.storage/localstorage.tests.js
    	test/jio.storage/replicaterevisionstorage.tests.js
    	test/jio.storage/revisionstorage.tests.js
    	test/jio.storage/s3storage.tests.js
    	test/jio.storage/splitstorage.tests.js
    	test/jio.storage/xwikistorage.tests.js
    	test/jio/tests.js
    	test/queries/tests.js
    	test/run-qunit.js
    	test/tests.html
    	test/tests.require.js
    fd52a421
s3storage.js 29.8 KB