1
0
Fork 0
Commit Graph

1338 Commits

Author SHA1 Message Date
Frank Celler 8eeb59cb71 fixed log output 2013-03-27 16:28:41 +01:00
Frank Celler 440170c144 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-03-27 15:05:22 +01:00
Frank Celler 7a6cdcf9b1 changing to app-id 2013-03-27 15:05:08 +01:00
Jan Steemann bfe232c299 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-03-27 14:24:19 +01:00
Jan Steemann 4bb32107ba triAGENS/ArangoDB-PHP#55
optimiser may have mis-optimised duplicate filter statements with limit
2013-03-27 14:22:49 +01:00
Frank Celler d8159a990e Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-03-27 11:32:52 +01:00
Frank Celler be971602f2 added install and uninstall of FOXX apps 2013-03-27 11:32:39 +01:00
Jan Steemann 1e051dff07 use realloc 2013-03-26 17:57:54 +01:00
Jan Steemann a5c1ebd09d more cleanup 2013-03-26 17:57:45 +01:00
Jan Steemann 771b03ced3 fixed exception handling in ArangoSh 2013-03-26 16:01:05 +01:00
Frank Celler a8d9a14e7d Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-03-26 13:58:20 +01:00
Frank Celler 557184631d more fox-manager, added files section 2013-03-26 13:58:00 +01:00
Jan Steemann 81d5c71cf3 fixed documentation 2013-03-26 10:08:26 +01:00
Thomas Richter 9a08a1d609 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
work in progress swagger
2013-03-26 09:14:05 +01:00
Thomas Richter 48df7ab80a work in progress 2013-03-26 09:13:56 +01:00
Jan Steemann fc35dffa92 potential improvement for #459 2013-03-25 16:56:10 +01:00
Jan Steemann 0e6c21e4e7 removed NEW_BORN collection status in server 2013-03-25 15:51:42 +01:00
Jan Steemann 0d41462823 added statistics function 2013-03-25 12:54:36 +01:00
Jan Steemann 54dbcb8121 fixed some caching issues 2013-03-25 12:23:42 +01:00
Jan Steemann d62a3a08a1 shutdown with lock 2013-03-25 11:11:33 +01:00
Jan Steemann 124d7cb29f fixed file uploads 2013-03-24 18:13:13 +01:00
Jan Steemann 071144ecc0 temporary file functons 2013-03-24 14:32:09 +01:00
Jan Steemann d9595caaf5 added upload API 2013-03-24 13:17:50 +01:00
Frank Celler 1736221bac fixed cyclic objects 2013-03-24 10:57:44 +01:00
Jan Steemann 76a86a853f fixed build? 2013-03-24 10:43:55 +01:00
Frank Celler 6f8e8ffbd1 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-03-23 19:50:43 +01:00
Frank Celler b99ee9517f cached collection in db 2013-03-23 19:50:31 +01:00
Jan Steemann fd446bac1a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-03-23 19:14:02 +01:00
Jan Steemann 5cf913b2ca zlib 2013-03-23 19:13:31 +01:00
Frank Celler 57e7224494 fixed ordering 2013-03-23 17:54:35 +01:00
Jan Steemann 0d2fdcae58 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
Conflicts:
	js/common/bootstrap/module-fs.js
2013-03-23 14:36:45 +01:00
Jan Steemann c473e42f77 fixed memleak 2013-03-22 18:38:17 +01:00
Frank Celler a8d5a06f57 added resetEngine 2013-03-22 18:09:01 +01:00
Frank Celler f1c7852eb4 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-03-22 17:33:34 +01:00
Frank Celler 38a5cf6a2d added development-mode 2013-03-22 17:33:25 +01:00
Jan Steemann 517c6f98dc document counting 2013-03-22 15:45:36 +01:00
Frank Celler 213e5ab214 added missing HandleScope 2013-03-22 15:15:02 +01:00
Frank Celler dfe96a0919 Merge branch 'feature/v8cleanup' into devel 2013-03-22 14:54:39 +01:00
Jan Steemann 564f35141e refactored writing of markers 2013-03-22 14:50:32 +01:00
Frank Celler f5ef270d50 Merge branch 'devel' of github.com:triAGENS/ArangoDB into feature/v8cleanup 2013-03-22 14:47:29 +01:00
Frank Celler 12f0c901e5 Merge branch 'devel' of github.com:triAGENS/ArangoDB into feature/v8cleanup
Conflicts:
	arangod/V8Server/v8-vocbase.cpp
	arangosh/V8Client/arangosh.cpp
2013-03-22 14:47:17 +01:00
Jan Steemann 28e0f8bd09 notify collections about transaction status changes 2013-03-22 13:34:02 +01:00
Thomas Richter f14efc0278 swagger added 2013-03-22 12:21:55 +01:00
Jan Steemann ccc7c3665b locking 2013-03-22 11:31:36 +01:00
Jan Steemann 228f273bc0 added isRollback hints to index insert/remove functions 2013-03-22 11:18:44 +01:00
Jan Steemann 69db58a154 index cleanup 2013-03-22 10:38:47 +01:00
Jan Steemann a9ab2695d6 changed error message 2013-03-22 09:00:29 +01:00
Jan Steemann 9b282ab74c some cleanup of transaction code 2013-03-21 18:54:38 +01:00
Jan Steemann b40ade45ce simplified code 2013-03-21 10:09:52 +01:00
Jan Steemann b175486258 changed to TRI_ASSERT_DEBUG 2013-03-20 19:01:19 +01:00