Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
12,852 Commits 358 Branches 495 Tags 994 MiB
Commit Graph

721 Commits

Author SHA1 Message Date
Jan Steemann 936fb6c6a6 better progress reports for replication applier 2013-07-31 10:01:56 +02:00
Jan Steemann 002ebd48bc removed all replication conditionals 2013-07-30 13:16:37 +02:00
Jan Steemann ec6792e11e added authentication 2013-07-28 16:02:21 +02:00
Jan Steemann 08b9f57166 stoppable replication applier 2013-07-17 10:58:10 +02:00
Oreste Panaia 2d4a26e29d Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-07-16 16:17:40 +08:00
Jan Steemann cdbcf71411 removed superfluous space 2013-07-15 17:48:44 +02:00
Oreste Panaia b4acec0fe6 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-07-15 22:54:38 +08:00
Jan Steemann b5e26235a7 replication configuration 2013-07-12 17:37:24 +02:00
Oreste Panaia b8163e79c4 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-07-12 22:40:37 +08:00
Jan Steemann 98dd1c2522 moved replication parts into separate files 2013-07-11 14:44:09 +02:00
Jan Steemann 80362ec82f fixed issues reported by cppcheck 2013-07-11 10:02:27 +02:00
Jan Steemann 3f718ef0fa fixed some issues in replication 2013-07-10 18:08:18 +02:00
Jan Steemann ca6b184286 added TRI_JSON_STRING_REFERENCE 2013-07-10 17:00:29 +02:00
Jan Steemann 7ef7ad297f added TRI_StealStringBuffer() 2013-07-10 12:02:42 +02:00
Jan Steemann 3cc4405c18 added collection.checksum() 2013-07-10 11:10:00 +02:00
Jan Steemann c6ff61b159 added new error code 2013-07-09 12:33:10 +02:00
Jan Steemann 4c952ad927 added unit tests 2013-07-09 12:32:47 +02:00
Jan Steemann 48d851bb7b log dump 2013-07-08 16:33:47 +02:00
Oreste Panaia 752a60025c merge conflicts 2013-07-08 16:47:39 +08:00
Oreste Panaia a7661542a2 windows 2012 fixes 2013-07-08 16:44:32 +08:00
Jan Steemann 054ed3ca3f apply collection data dumps 2013-07-05 11:41:37 +02:00
Jan Steemann 230f0ddcc3 added errors 2013-07-04 15:51:24 +02:00
Jan Steemann f5968a4646 handle a master's state response 2013-07-04 10:13:09 +02:00
Jan Steemann 44c9ca4e90 issue #565, plus a few usability fixxes for aal.search() 2013-07-03 14:06:57 +02:00
Jan Steemann e34566aa68 messed it up and fixed it 2013-07-03 13:06:20 +02:00
Jan Steemann cf04fcfc44 memory size restrictions 2013-07-03 13:01:01 +02:00
Jan Steemann c5cbfdb3e6 indentation 2013-07-03 12:40:12 +02:00
Jan Steemann 74489d9f93 OOM handling 2013-07-02 17:33:31 +02:00
Jan Steemann a35de51042 handle OOM 2013-07-02 17:19:03 +02:00
Jan Steemann d2b12968e0 avoid usage of NULL pointer 2013-07-02 17:09:44 +02:00
Jan Steemann 00b5970bfc check for NULL values 2013-07-02 17:08:27 +02:00
Jan Steemann d7561e70e1 added logging options 2013-07-02 12:16:13 +02:00
Jan Steemann 2e063df6c1 fixed some zone debugging output 2013-06-29 00:10:41 +02:00
Jan Steemann 64f01e9a7b prevent logging deadlock 2013-06-28 19:14:33 +02:00
Jan Steemann 1f68cb50a0 replaced LOG_ERROR with fprintf to not run into logging deadlock 2013-06-28 19:04:56 +02:00
Jan Steemann 6e9c3e8e2c replication logging 2013-06-26 12:04:55 +02:00
Jan Steemann b0acfba634 less faults when server cannot start 2013-06-25 09:56:09 +02:00
Jan Steemann 191d389e8c a few mallocs less 2013-06-24 20:55:12 +02:00
Jan Steemann 315848c93c typo 2013-06-24 20:52:43 +02:00
Jan Steemann 0f7c632f0f less strlen 2013-06-24 17:31:37 +02:00
Jan Steemann 2d7edbef96 added db._exists() 2013-06-21 21:50:00 +02:00
Jan Steemann 8063ade2be fixed issues reported by cppcheck 2013-06-21 19:40:57 +02:00
Jan Steemann ee2de60670 less syscalls in logging, do not use file-logging in tests 
file-based logging creates a problem with Valgrind 3.8.1 for `make unittests-http-server VALGRIND=valgrind` on OpenSuse 64 bits, -O2
 2013-06-21 16:05:58 +02:00
Jan Steemann b1f243d296 fixed segfault for too big shapes, make shape collection filesize adaptive 2013-06-20 19:14:14 +02:00
Jan Steemann 9599a021b9 moved some graph traversal validation into the traversal module 
- that simplifies some of the traversal-calling routines
- make returning error codes more consistent (specific 404 errors when
referring to unknown collections instead of simple 400 errors)
- optionally limit traversals to a certain number of iterations so they
  don't run endlessly in cyclic graphs
 2013-06-12 17:04:47 +02:00
Oreste Panaia 35ab2e6f62 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-06-10 17:05:58 +08:00
Oreste Panaia 8e10a5e173 windows updates 2013-06-10 17:05:33 +08:00
Jan Steemann d31573a8b4 fixed a few type issues, updated TODOs 2013-06-07 11:31:42 +02:00
Oreste Panaia 2afd8a742c Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-06-05 19:53:25 +08:00
Oreste Panaia 8a95c1c2a8 update 2013-06-05 19:52:34 +08:00
Guido Reina 7decf1560a TRI_CreateRecursiveDirectory returns an int, but the function prototype says it returns a bool (the return code is not checked in the source code, so it is not a problem). 2013-05-26 18:44:35 +02:00
Guido Reina 0331ff7993 Typo. 2013-05-26 18:16:36 +02:00
Guido Reina 6ec2014052 dst->length is set again afterwards. 2013-05-26 18:04:46 +02:00
Oreste Panaia 70bc62a5a5 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-05-21 17:47:22 +08:00
Oreste Panaia b764b4f71e extended errors for skiplist 2013-05-21 17:45:19 +08:00
Jan Steemann d7b64d4ae2 merged patches by @guidoreina 2013-05-21 11:33:43 +02:00
Jan Steemann ed77c19e16 added derived file 2013-05-17 15:59:58 +02:00
Jan Steemann c59f00efa8 fixed handling of --temp-path 2013-05-15 15:55:48 +02:00
Jan Steemann 35f3711d08 less realloc 2013-05-13 21:48:09 +02:00
Jan Steemann 06fb9eacd7 fixed wrong size calculation 2013-05-13 09:23:23 +02:00
Jan Steemann c7d2f8f8cd some json / shaped-json and string handling improvements 2013-05-13 09:01:07 +02:00
Jan Steemann 8d329e3ab0 removed some redundant code 2013-05-13 08:59:52 +02:00
Jan Steemann 5b94d9af98 less malloc/free for JSON parsing 2013-05-08 23:32:14 +02:00
Jan Steemann 6740db7207 fix different resident set size report units 2013-05-08 19:10:49 +02:00
Jan Steemann d40f96d8e9 fixed potential memleaks 2013-05-08 18:02:10 +02:00
Jan Steemann eb8325ef34 fixed typo in error message 2013-05-08 11:10:34 +02:00
Jan Steemann 203aceccdf Merge pull request #510 from guidoreina/experiment 
A bug fix and small code improvements?
 2013-05-05 23:51:49 -07:00
Guido Reina 2f4319b31a [Small improvements] In the function ResizeAssociativeArray(), array->_table is already initialized to '\0's, so there is no need to call clearElement() for each element. 
An associative array is only used by PQIndex and MasterTable_t.
For PQIndex the function ClearElementPQIndex() will be used, which sets the whole element to '\0's.
For MasterTable_t the function tablePositionClearElement() will be used, which sets all but one field to 0/NULL (the only field which is not set is _vectorNum).
If the clearElement() should be called, maybe TRI_Allocate() could be called with false, to avoid double initialization.
When copying elements, the for loop stops when the number of elements is the same as the original number of elements.

In the function TRI_FindByKeyAssociativeArray(), there is no need to check whether the element is not empty and is equal key element, only if it is not empty (as it is done in the function TRI_InsertKeyAssociativeArray()).
In the function TRI_FindByElementAssociativeArray(), there is no need to check whether the element is not empty and is equal element element, only if it is not empty (as it is done in the function TRI_InsertElementAssociativeArray()).
 2013-05-05 18:10:37 +02:00
Guido Reina 4ac19a99fc Typos. 2013-05-05 16:12:17 +02:00
Frank Celler 51cefb18bf fixed issue 505: statistics not populated on MacOS 
Conflicts:
	CHANGELOG
 2013-05-04 21:54:22 +02:00
Jan Steemann ee7ab712d6 issue #495 2013-05-03 11:08:58 +02:00
Frank Celler f85b1c5a21 Merge pull request #499 from guidoreina/experiment 
Minor changes
 2013-05-01 05:27:07 -07:00
Guido Reina 4c5494c67d In the functions TRI_VerifyLockFile (Linux and Windows), the buffer 'buffer' was initialized to 0 right before calling TRI_UInt32String(), making TRI_UInt32String() return always 0, instead of the PID. 2013-05-01 11:05:20 +02:00
Oreste Panaia 115d87196c sync windows dev 2013-04-29 23:13:06 +08:00
Oreste Panaia c42c0bf565 sync dev for windows 2013-04-29 21:49:28 +08:00
Oreste Panaia 532c7eae8e windows dev update 2013-04-29 21:24:57 +08:00
Oreste Panaia ee339ffd9f windows 1.3 changes 2013-04-23 19:03:08 +02:00
Oreste Panaia 1ddbd2e4d9 update 2013-04-23 19:02:46 +08:00
Oreste Panaia b83d90f021 skiplist transaction support 2013-04-23 18:56:26 +08:00
Jan Steemann 8ea6915b55 added IndexedPropertyGetter for ShapedJson 2013-04-19 11:35:55 +02:00
Jan Steemann b667e458fc fixed error messages 2013-04-16 11:55:17 +02:00
Jan Steemann f6c4589852 fixed type 2013-04-16 11:39:07 +02:00
Jan Steemann dee5adb9f5 added client side API for transactions 2013-04-12 23:18:48 +02:00
Jan Steemann 9b5849f650 updated documentation 2013-04-12 00:42:02 +02:00
Jan Steemann 229893c086 documentation for transactions 2013-04-12 00:03:05 +02:00
Jan Steemann b6925a7b7b transactions 2013-04-11 19:06:55 +02:00
Jan Steemann 7f1cd2681c added functions to add to front 2013-04-10 08:50:49 +02:00
Jan Steemann 5f5ee7e5e1 added error code 2013-04-10 08:50:13 +02:00
Frank Celler a0278476da Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	lib/Basics/StringUtils.cpp
 2013-04-06 10:19:09 +02:00
Frank Celler 1d7ee507e2 added TRI_ERROR_ARANGO_DOCUMENT_KEY_MISSING 2013-04-06 10:18:29 +02:00
Jan Steemann edf513551f error handling 2013-04-05 15:35:08 +02:00
Jan Steemann ed10d9b6aa AQL user functions 2013-04-05 12:50:44 +02:00
Jan Steemann 1417def879 disallow create/drop/rename operations inside transactions 2013-04-04 09:41:44 +02:00
Jan Steemann f7a5cf4cf3 transactions 2013-04-03 14:40:23 +02:00
Frank Celler f810711a79 FreeBSD port 2013-04-02 18:43:10 +02:00
Frank Celler 42b92c794f fixed error messages and tests 2013-04-02 17:46:19 +02:00
Frank Celler 31a9a71050 fixed unzip and create of parent directory 2013-03-28 20:31:04 +01:00
Jan Steemann 007cae87e6 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-03-28 14:42:19 +01:00
Jan Steemann ba0d608a25 renamed function 2013-03-28 14:13:11 +01:00
Lucas Dohmen f1b5f20fab Foxx: Also using ArangoDB Mimetype Lookup for the other way around 2013-03-28 14:01:04 +01:00
Lucas Dohmen 8261a46577 Added a Mimetype 2013-03-28 13:25:30 +01:00
Jan Steemann 3fd4fd984b mimetypes w/ charsets 2013-03-27 10:31:30 +01:00
Jan Steemann 909c316e22 added mimetype generation file 2013-03-27 10:11:56 +01:00
Jan Steemann 1492118545 added test cases for "fs" module 2013-03-26 14:09:20 +01:00
Jan Steemann 75d2d05b04 added comment 2013-03-24 18:58:05 +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
Jan Steemann f58e1a4b9a sendFile 2013-03-24 11:44:29 +01:00
Jan Steemann 91fbb454f3 added zipFile() 2013-03-23 22:32:59 +01:00
Jan Steemann d97954e466 unzip 2013-03-23 20:52:33 +01:00
Jan Steemann 5cf913b2ca zlib 2013-03-23 19:13:31 +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
Frank Celler 8a54df7419 added .arangosh.rc, added /_admin/execute 2013-03-23 14:04:08 +01:00
Frank Celler 734a0350e4 fixed wrong cast 2013-03-19 14:17:29 +01:00
Jan Steemann 95d78faa3c fixed doxygen errors 2013-03-18 20:07:31 +01:00
Oreste Panaia 081ad862a6 CAS modifications 2013-03-18 19:52:53 +08:00
Oreste Panaia 8333858eac CAS modifications 2013-03-18 19:11:18 +08:00
Jan Steemann b6f680cd46 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 
Conflicts:
	arangod/VocBase/document-collection.c
 2013-03-15 18:16:36 +01:00
Jan Steemann 312b5fda64 some refactoring of document CRUD operations 2013-03-15 17:58:56 +01:00
Frank Celler 71fbdf87cd Mac fixes 2013-03-15 15:46:17 +01:00
Frank Celler b0fc77d83d Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-03-15 11:37:59 +01:00
Frank Celler c773a0e825 replaced union by CONST_CAST 2013-03-15 11:37:49 +01:00
Oreste Panaia c8ea7ddc8b prepartion for skiplist transactions 2013-03-15 18:26:15 +08:00
Oreste Panaia 36733eb19f preparation for skiplists supporting transactions 2013-03-15 18:12:20 +08:00
Jan Steemann 12a0bc787c empty string optimisations 2013-03-14 16:41:28 +01:00
Jan Steemann ab14179ee7 made fsync configurable when writing json files 2013-03-14 12:33:25 +01:00
Frank Celler 891cac01b2 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	arangod/VocBase/collection.c
 2013-03-13 17:05:59 +01:00
Frank Celler 1aa5109fa3 updated disclaimer 2013-03-13 17:03:18 +01:00
Achim Brandt eb8855d37a removed <mach/shared_memory_server.h> for MacOSX 2013-03-12 16:54:45 +01:00
Frank Celler c915bfa5ff cleanup of indexes, fix for compaction (hash, cap, geo) 
Conflicts:
	arangod/VocBase/compactor.c
	arangod/VocBase/document-collection.c
	arangod/VocBase/synchroniser.c
	arangod/VocBase/vocbase.c
 2013-03-11 09:49:58 +01:00
Jan Steemann 1a7e6b2d5b colorize! 2013-03-08 18:36:11 +01:00
Jan Steemann 99630450c2 removed checks for TRI_HAVE_ICU because ICU is a prerequisite for using ArangoDB 2013-03-08 16:03:54 +01:00
Jan Steemann 1ea4c1c4b0 issue #443 2013-03-08 15:16:29 +01:00
Jan Steemann 0a883f4076 merged some changes from trx branch into devel 2013-03-08 14:22:25 +01:00
Jan Steemann b307e4cd6d completed auto-increment key generator 2013-03-08 10:51:50 +01:00
Jan Steemann 092327058b potential solution for #438 (non-windows) 2013-03-07 10:50:40 +01:00
Jan Steemann a73d32c553 initialise lists to the correct size 2013-03-07 00:46:27 +01:00
a-brandt 18c05bdac6 added session errors 2013-03-06 14:05:42 +01:00
Frank Celler dd96bb4abd Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-03-03 22:40:55 +01:00
Frank Celler 7abeda64b8 fixed process statistics for MacOSX 2013-03-01 13:37:44 +01:00
Oreste Panaia 586a10ef2c final merge errors 2013-03-01 18:19:30 +08:00
Oreste Panaia 0f5717cd61 more merge conflicts fixes 2013-02-28 21:36:14 +08:00
Oreste Panaia fc5e1ba623 merge conflicts with devel 2013-02-28 19:42:58 +08:00
Oreste Panaia a48696ec28 network modifications required for windows 2013-02-28 17:43:39 +08:00
Jan Steemann ebc653a0bd issue #435 2013-02-26 12:11:13 +01:00
Jan Steemann cd6c4c99a5 adjust log buffers for frontend 
now the log level & date are not redundantly stored in the log message
 2013-02-23 01:29:51 +01:00
Jan Steemann 8e5919b597 return error if oom 2013-02-23 01:16:21 +01:00
Jan Steemann 81f79315d1 removed configure option --enable-zone-debug 2013-02-22 15:54:14 +01:00
Oreste Panaia 9e69106c90 Merge branch '1.2' of https://github.com/triAGENS/ArangoDB into 1.2 2013-02-22 16:58:06 +08:00
Oreste Panaia ea601a23b3 Socket changes for windows libev 2013-02-22 16:51:13 +08:00
Frank Celler fe9f10af8d Merge branch 'devel' of github.com:triAGENS/ArangoDB into 1.2 
Conflicts:
	CHANGELOG
	Documentation/Manual/arangodb_1.2_shell_reference_card.pdf
	Makefile.in
	aclocal.m4
	config/compile
	config/config.guess
	config/config.sub
	config/depcomp
	config/missing
	configure
	lib/JsonParser/json-parser.c
 2013-02-21 14:21:59 +01:00
Frank Celler 2553b572ab fixed mode 2013-02-21 14:14:20 +01:00
Jan Steemann 53b41e7832 get rid of Valgrind warnings due to libev re-alloc behavior 2013-02-20 19:33:32 +01:00
Jan Steemann e1da2c45fd added TRI_ShutdownMemory() to free core reserve on clean shutdown 2013-02-20 19:11:33 +01:00
Oreste Panaia 2c12f63d7f libev interface 2013-02-19 20:58:21 +08:00
Jan Steemann 4f37fada0d some mini-modifications for slightly higher throughput 2013-02-19 09:54:36 +01:00
Frank Celler 2ac556d0f1 changed default 2013-02-18 10:06:36 +01:00
Frank Celler ced7b05cca added fix for TRI_ENABLE_LOGGING from Jan 2013-02-16 14:03:35 +01:00
Frank Celler 45c815b7eb fixed issue #403: Usage of exit() etc. 2013-02-15 12:19:09 +01:00
Frank Celler 7b92dcc9bc fixed issue #405: 1.2 compile warnings 2013-02-15 11:57:35 +01:00
Frank Celler cf9a942417 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	CHANGELOG
 2013-02-15 11:52:53 +01:00
Frank Celler e4d1c8a6bd partly fix for issue #333: [debian] Group arangodb is not used when starting vie init.d script 2013-02-15 11:50:05 +01:00
Jan Steemann d321f32523 moved some const value out of loop 2013-02-15 11:35:48 +01:00
Jan Steemann 8b7a5d2649 slighty optimise duplicates check 2013-02-15 10:22:47 +01:00
Jan Steemann 637ed65e09 expose reserve function 2013-02-15 10:22:31 +01:00
Frank Celler 069dcdfc94 changed logging of fatal errors 2013-02-14 16:47:35 +01:00
Jan Steemann 332da75bcb fixed invalid number to string conversion for edge cases 2013-02-13 11:35:34 +01:00
Jan Steemann 8365c4294c small mods 2013-02-12 18:16:23 +01:00
a-brandt 6147a1d9c0 unset the escape codes for windows 2013-02-08 15:39:52 +01:00
Jan Steemann f16f88a2e6 added docs for CONTAINS(), added LIKE() 2013-02-06 11:40:45 +01:00
Jan Steemann 3fd6373c2f removed error 1520, replaced with standard error 1203 2013-02-04 23:04:37 +01:00
Jan Steemann 621f0dbb2c test remove 2013-02-01 10:49:18 +01:00
Jan Steemann ca0074f3c0 test add 2013-02-01 10:48:25 +01:00
Jan Steemann a36805857b test remove 2013-02-01 10:47:59 +01:00
Jan Steemann 089ac0a7b7 test add 2013-02-01 10:46:45 +01:00
Jan Steemann 5c55f6bf97 test remove 2013-02-01 10:46:09 +01:00
Jan Steemann e489c7380c test 2013-02-01 10:43:56 +01:00
Jan Steemann 8330f2d12a test 2013-02-01 10:33:24 +01:00
Jan Steemann 767c4fb3bb test 2013-02-01 10:31:28 +01:00
Jan Steemann 4f4e0e7a9a test 2013-02-01 10:27:28 +01:00
Jan Steemann 8b523873d5 test 2013-02-01 10:26:24 +01:00
Jan Steemann 8927da8020 test 2013-02-01 10:24:53 +01:00
Jan Steemann 424d284961 test 2013-02-01 10:20:25 +01:00
Jan Steemann 98e8e24604 test 2013-02-01 10:18:59 +01:00
Jan Steemann d9b572bfb0 test 2013-02-01 10:16:21 +01:00
Jan Steemann e9ff3b7749 test 2013-02-01 10:14:59 +01:00
Jan Steemann bae7bfd588 test 2013-02-01 10:14:01 +01:00
Jan Steemann ee3c534b7f test 2013-02-01 10:12:28 +01:00
Jan Steemann 9b7245373f test commit 2013-02-01 09:26:22 +01:00
Jan Steemann d43e9b89ca issue #381: lifted restrictions on usernames 2013-01-31 13:20:39 +01:00
Oreste Panaia 741510e8cb Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-01-31 17:33:36 +08:00
Jan Steemann 2d7f0a7979 removed an unnecessary file 2013-01-31 10:33:16 +01:00
Jan Steemann 8d501f75e4 test commit hook 2013-01-31 10:30:43 +01:00
Jan Steemann 2c82dae6d8 test commit hook 2013-01-31 10:30:19 +01:00
Oreste Panaia 95f6b0dc9c Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-01-31 16:22:41 +08:00
Jan Steemann 843453a76c test for infinite values to prevent endless while loops in number value printing 2013-01-30 19:26:43 +01:00
Oreste Panaia 3c8093849a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-01-31 00:07:19 +08:00
Oreste Panaia e0b7fbbf8d windows icu 2013-01-31 00:04:20 +08:00
Jan Steemann fe74508299 return a hard-coded string in case no error message is known for a particular error 2013-01-30 16:44:25 +01:00
Jan Steemann 47ad5e1139 removed dead configure option for 1.2 2013-01-30 13:19:20 +01:00
Jan Steemann 9773a88cf9 prevent endless loops for inf double values being appended to string buffer 2013-01-29 12:07:30 +01:00
Jan Steemann ac12e98480 wrong type for thread id. this caused potentially wrong thread ids on 32 bits... 2013-01-26 01:35:40 +01:00
Jan Steemann 17530a5e45 added number of shapes in return value of figures() 2013-01-25 10:19:02 +01:00
Jan Steemann 5d093576e2 fix a few -pedantic errors 2013-01-23 08:58:54 +01:00
Oreste Panaia bb54d606ad Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-01-22 23:06:39 +08:00
Oreste Panaia c4f6465ee7 attempt to link icu libraries into arango 2013-01-22 23:04:16 +08:00
Jan Steemann 376c264281 take precautions to prevent issue #365 2013-01-22 11:58:08 +01:00
Jan Steemann f1fbb4796e fixed anonymous mmap for MacOS 2013-01-16 12:32:28 +01:00
Jan Steemann a20cb437e1 some macros for zone debug 2013-01-16 01:58:41 +01:00
Jan Steemann 6fde7e2f27 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-01-15 16:45:54 +01:00
Jan Steemann 7a6db16241 added db._version() 2013-01-15 16:44:48 +01:00
Frank Celler 244d258fe7 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-01-15 15:51:32 +01:00
Frank Celler 7380ddfabe Merge branch '1.1' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	arangosh/V8Client/arangosh.cpp
	bin/arango32.msi
	bin/arango64.msi
	lib/BasicsC/win-utils.c
 2013-01-15 15:50:47 +01:00
Jan Steemann 4712e1637e optionally do not check element equality when inserting into the associative multi index 
this might speed up insertion a lot if we know that the same element cannot be in the index already
 2013-01-15 15:11:16 +01:00
Jan Steemann 682d22bfb0 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-01-15 14:35:19 +01:00
Jan Steemann 2058700697 issue #353 2013-01-15 14:35:05 +01:00
Oreste Panaia c01a5c6275 arango shell and import 2013-01-14 20:16:09 +08:00
a-brandt c1fec4c5b0 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-01-10 14:48:26 +01:00
Frank Celler 128cb67c8b Merge remote-tracking branch 'origin/1.1' into devel 
Conflicts:
	Documentation/Examples/shell-read-document-bad-handle
	Makefile.in
	arangod/Documentation/shell-document.dox
	configure
	js/actions/system/api-collection.js
	js/actions/system/api-index.js
	js/actions/system/api-system.js
	js/common/bootstrap/modules.js
	js/common/bootstrap/print.js
	js/server/ArangoCollection.js
	lib/V8/v8-utils.cpp
 2013-01-09 15:30:21 +01:00
Oreste Panaia afa0268e70 Merge branch '1.1' of https://github.com/triAGENS/ArangoDB into 1.1 2013-01-09 22:23:46 +08:00
Oreste Panaia 9baae9c129 windows bug fixes 2013-01-09 22:23:35 +08:00
a-brandt 00a3d87bc4 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-01-08 10:43:28 +01:00
a-brandt 8f9e2e51f9 libicu is mandatory now 2013-01-08 10:39:19 +01:00
Jan Steemann 876cda6ce1 cppcheck 2013-01-07 22:37:52 +01:00
Frank Celler 89a7cac605 added listTree 2013-01-05 22:45:09 +01:00
Frank Celler 0549528325 Merge branch '1.1' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	CHANGELOG
	Makefile.in
	arangod/V8Server/ApplicationV8.cpp
	arangod/V8Server/v8-vocbase.cpp
	html/admin/js/master.js
	js/actions/system/api-collection.js
	js/common/bootstrap/errors.js
	js/server/version-check.js
	lib/BasicsC/errors.dat
	lib/BasicsC/logging.c
	lib/BasicsC/voc-errors.c
	lib/BasicsC/voc-errors.h
 2013-01-05 11:16:50 +01:00
Jan Steemann 51305de692 in-memory collections, seem to work now 
documentation and some helper functions are still missing
 2013-01-04 17:04:15 +01:00
Jan Steemann 0471ee8a0d memory collections, intermediate commit 2013-01-04 15:50:29 +01:00
Frank Celler f9dba124dd Merge remote-tracking branch 'origin/issue317' into 1.1 
Conflicts:
	js/common/bootstrap/modules.js
 2013-01-03 18:57:18 +01:00
Frank Celler 114de14816 fixed duplicate 2013-01-03 17:16:25 +01:00
Frank Celler 53364b7f15 updated error codes 2013-01-03 16:31:55 +01:00
Jan Steemann 63805cf84c a few small fixes for logging 2013-01-03 14:47:16 +01:00
Jan Steemann 132143289d a few small fixes for logging 2013-01-03 14:45:56 +01:00
Frank Celler 503e0ff8fe fixed merge conflicts 2013-01-02 18:07:57 +01:00
Frank Celler 9917ece449 added missing padding for 32bit 2013-01-02 16:17:38 +01:00
Jan Steemann 459f935d00 intptr_t to uintptr_t conversion 2013-01-02 15:00:59 +01:00
Jan Steemann 74f9ced94e issue #335 2013-01-02 14:37:46 +01:00
Jan Steemann 19f459331d issue #335 2013-01-02 14:25:19 +01:00
Jan Steemann ea48388726 issue #335 2013-01-02 14:12:44 +01:00
Oreste Panaia fa3f3a41c8 windows binaries 2012-12-20 21:14:13 +08:00
Frank Celler d5f24ce13c Merge remote-tracking branch 'origin/windows' into HEAD 
Conflicts:
	CHANGELOG
	Documentation/InstallationManual/Installing.md
	Documentation/Makefile.files
	Documentation/Scripts/generateTOC.py
	Documentation/header.html
	Installation/OBS/clean-repo.sh
	Installation/OBS/create-repo.sh
	Installation/OBS/create-ymp.sh
	Installation/OBS/index.html
	Installation/OBS/load-repo.sh
	Makefile.in
	VERSION
	aclocal.m4
	arangod/Ahuacatl/ahuacatl-functions.c
	arangod/Documentation/user-manual.dox
	arangod/V8Server/v8-actions.cpp
	arangod/V8Server/v8-vocbase.cpp
	arangod/VocBase/collection.c
	arangod/VocBase/datafile.c
	arangosh/V8Client/arangosh.cpp
	config/compile
	config/config.guess
	config/config.sub
	config/depcomp
	config/install-sh
	config/missing
	configure
	configure.ac
	js/server/arango-upgrade.js
	js/server/modules/org/arangodb/actions.js
	lib/BasicsC/logging.c
	lib/Utilities/ScriptLoader.cpp
 2012-12-20 11:11:47 +01:00
Oreste Panaia 83ded3fc1f windows fixes 2012-12-20 17:17:30 +08:00
Jan Steemann 669fe4275a cppcheck 2012-12-18 16:44:06 +01:00
Frank Celler 621e4409bc Merge remote-tracking branch 'origin/1.1' into devel 
Conflicts:
	.gitignore
	CHANGELOG
	Documentation/Makefile.files
	Installation/build.sh
	Installation/epm/arangodb.list
	Makefile.in
	README
	README.md
	VERSION
	aclocal.m4
	arangod/HashIndex/hasharray.c
	arangod/RestServer/ArangoServer.cpp
	arangod/V8Server/ApplicationV8.cpp
	config/config.guess
	config/config.sub
	config/depcomp
	configure
	configure.ac
	html/admin/js/master.js
	js/server/arango-password.js
	js/server/version-check.js
	lib/BasicsC/files.c
	lib/BasicsC/logging.c
	utils/Makefile.files
 2012-12-18 13:37:34 +01:00
Jan Steemann 697d09a558 fixed race conditions in multi-threading that may happen in some environments. looks like va_copy etc. are not always thread safe... 2012-12-18 12:57:39 +01:00
Jan Steemann b8ca0b2d4d fulltext index massive rewrite 2012-12-15 01:01:25 +01:00
Jan Steemann b5d0457f3a fixed some issues reported by cppcheck 2012-12-12 18:42:11 +01:00
Jan Steemann 473aaa8fd4 fixed typos 2012-12-11 18:57:50 +01:00
Jan Steemann bfb6398110 added (intentional) compile error for Windows 2012-12-10 15:51:48 +01:00
Jan Steemann 8e201eba20 added #error markers for Windows 2012-12-10 15:50:02 +01:00
Jan Steemann 6d8851d83c protect against some invalid cases 2012-12-10 15:43:51 +01:00
Jan Steemann 9a9e8c3214 added test case for absolute path 2012-12-10 15:39:57 +01:00
Jan Steemann b16f672902 fixed some log errors on startup & shutdown 2012-12-10 15:18:35 +01:00
Oreste Panaia 4ece32bed4 test 2012-12-10 19:42:50 +08:00
Oreste Panaia 033adb225b Updated windows installer 2012-12-10 19:33:32 +08:00
a-brandt 1794ea49fa added new function for getting words 2012-12-07 13:09:16 +01:00
Jan Steemann ec9f72f227 return appropriate error codes 2012-12-07 10:49:06 +01:00
Oreste Panaia 857b66c490 windows version 2012-12-06 20:44:01 +08:00
Jan Steemann 242a16d6f5 proper naming of ICU functions 2012-12-06 12:27:22 +01:00
Jan Steemann 0d952b6f50 factored out a function 2012-12-06 10:27:17 +01:00
Jan Steemann c7793f2620 switched to TRI_ malloc 2012-12-06 10:18:17 +01:00
Jan Steemann 1ffa8e702c more tests and documentation for fulltext indexes 2012-12-05 16:12:33 +01:00
Jan Steemann eb39af1e78 handle out of memory 2012-12-03 16:44:16 +01:00
a-brandt 32fbb4109c added tolower and toupper for utf8 2012-12-03 13:30:33 +01:00
Frank Celler cfe80c6b9c added generated files 2012-11-27 12:54:19 +01:00
Frank Celler 832be07319 Merge branch '1.1' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	Makefile.in
	lib/BasicsC/logging.c
	utils/arango-upgrade.in
 2012-11-27 12:37:41 +01:00
Frank Celler 6e94eeb36f Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2012-11-27 12:35:12 +01:00
Frank Celler 249492a89c Merge remote-tracking branch 'origin/1.1' into devel 
Conflicts:
	CHANGELOG
	Documentation/Manual/GlossaryCollectionName.md
	Documentation/Manual/NewFeatures11.md
	Documentation/UserManual/FirstStepsArangoDB.md
	VERSION
	arangod/Documentation/api-blueprints.dox
	arangod/HashIndex/hasharray.c
	arangod/RestHandler/RestVocbaseBaseHandler.cpp
	arangod/RestServer/ArangoServer.cpp
	arangod/V8Server/v8-actions.cpp
	arangod/V8Server/v8-vocbase.cpp
	arangod/VocBase/compactor.c
	arangod/VocBase/document-collection.c
	configure.ac
	html/admin/js/master.js
	js/server/ahuacatl.js
	js/server/arango-upgrade.js
	lib/BasicsC/voc-errors.h
	lib/V8/V8LineEditor.cpp
	lib/V8/v8-utils.cpp
 2012-11-27 12:34:58 +01:00
Jan Steemann ad6489c2b7 issue #295 2012-11-27 12:30:12 +01:00
Jan Steemann 1d98ab44fc issue #295 2012-11-27 12:23:26 +01:00
Jan Steemann bc94851026 fixed compile warnings 2012-11-23 13:18:00 +01:00
Jan Steemann e7f8543d81 moved documentation changes from 1.1 to devel 2012-11-23 10:18:47 +01:00
Jan Steemann b2faa016a6 fixed gcc compile warnings 2012-11-22 21:34:41 +01:00
Jan Steemann aaf34f44f4 fixed lots of compile warnings 2012-11-22 21:20:22 +01:00
Frank Celler cccb3511c5 fixed documentation again 2012-11-21 17:42:13 +01:00
Jan Steemann 55463a6c64 fixed race conditions in multi-threading that may happen in some environments. looks like va_copy etc. are not always thread safe... 2012-11-20 21:04:19 +01:00
Jan Steemann ace85c43c9 nesting transactions from v8-vocbase... 2012-11-15 18:55:52 +01:00
Jan Steemann 1ff2430e39 transaction refactoring 2012-11-15 13:53:11 +01:00
Jan Steemann 12d76b8306 introduced additional transaction type for import 2012-11-15 09:52:47 +01:00
Jan Steemann 30ba8771a7 pluggable key generators 2012-11-14 12:44:56 +01:00
Jan Steemann 008ad959d5 fixed octal conversion, wrote tests 2012-11-08 15:07:48 +01:00
Jan Steemann e438108f90 moved and fixed hex conversion, wrote tests for hex conversion 2012-11-08 14:31:49 +01:00
Jan Steemann 85ea90afdb removed redundant conversion functions 2012-11-08 13:55:12 +01:00
Jan Steemann d2d5b439d5 added conversion functions for int8 and int16 2012-11-08 13:33:39 +01:00
Jan Steemann 16ee94def3 added in-place num-to-string conversions, added tests for conversions 2012-11-08 13:13:30 +01:00
Jan Steemann dacd2fb70c some cleanup 2012-11-06 19:24:27 +01:00
Jan Steemann 59791248bf some refactoring of v8-vocbase, trx integration 2012-11-06 19:02:09 +01:00
Jan Steemann 203560d30b moved transactions into javascript object 2012-11-06 14:42:52 +01:00
Jan Steemann 0ed1f985fe create private copies of other write transactions 2012-11-06 12:56:51 +01:00
Jan Steemann d9f8219bd6 added --enable-trx option 2012-10-31 11:21:06 +01:00
a-brandt 7daa018969 removed "reuseID" 2012-10-26 12:36:13 +02:00
Jan Steemann cb6c8c8e7e added bidirectional edges, fixup edges index 2012-10-25 17:18:54 +02:00
Jan Steemann c53cd0b408 added TRI_SizeFile() plus test 2012-10-24 18:37:40 +02:00
Jan Steemann 994a53b0b4 ifdef'd statistics 2012-10-23 11:55:24 +02:00
Oreste Panaia 4d8d78e880 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 
Conflicts:
	VisualStudio/Arango Front End Library/Arango Front End Library.vcxproj
	arangod/Actions/RestActionHandler.cpp
	arangod/RestServer/ArangoServer.cpp
	lib/ApplicationServer/ApplicationServer.cpp
 2012-10-22 21:04:12 +08:00
Oreste Panaia aad73db128 various changes for windows 2012-10-22 20:51:31 +08:00
Jan Steemann 4d6f32a5d4 more languages 2012-10-17 17:50:55 +02:00
Jan Steemann 6f5961a9eb added some extra comments 2012-10-17 16:05:51 +02:00
Jan Steemann be54759314 issue #245 2012-10-17 14:24:31 +02:00
Jan Steemann c2be68fc7f issue #245 2012-10-17 14:21:46 +02:00
Jan Steemann f0b615ab9e disable internal statistics by default 2012-10-16 17:43:11 +02:00
Jan Steemann 2369bc5bee disable internal statistics by default 2012-10-16 17:34:05 +02:00
Frank Celler 195d6903c1 added generated files 2012-10-14 16:23:48 +02:00
Frank Celler c0c869d1ff Merge branch 'devel' of github.com:triAGENS/ArangoDB 
Conflicts:
	arangod/RestServer/ArangoServer.cpp
	arangosh/ArangoShell/ArangoClient.cpp
	js/client/js-client.h
 2012-10-13 16:28:09 +02:00
Jan Steemann cc371c4eb0 centralised and unified bye message 2012-10-12 21:46:58 +02:00
Frank Celler 7c3547e815 Merge branch 'devel' of github.com:triAGENS/ArangoDB 
Conflicts:
	Makefile.files
	Makefile.in
	js/actions/system/api-system.js
 2012-10-11 23:18:55 +02:00
Jan Steemann 224e37a1ba fix some memory issues 2012-10-11 22:49:46 +02:00
Frank Celler bbd9698d22 removed generated files 2012-10-11 16:20:08 +02:00
Jan Steemann b642b48603 fixed memory issues 2012-10-11 14:08:38 +02:00
Jan Steemann 85cba473ba fixed memory clearing in TRI_EraseFrontStringBuffer for some cases 2012-10-11 13:31:43 +02:00
Jan Steemann 9ffc7a7cfd fix memory zone issues 2012-10-10 23:49:18 +02:00
Jan Steemann a4b979222f fixed memory zone issues, memleaks 2012-10-10 19:05:16 +02:00
Jan Steemann 31ce03b31d fixed some memory zone issues 2012-10-10 15:17:46 +02:00
Jan Steemann a08b5ac230 remove configure option --enable-lock-check. has done its purpose already 2012-10-10 14:21:25 +02:00
Oreste Panaia 0e835b90b2 windows 2012-10-08 23:29:29 +08:00
Oreste Panaia ab15e33b89 memory mapped files extensions for windows 2012-10-08 17:17:03 +08:00
Oreste Panaia aac17f7b55 wrapper for memory mapped files add 2012-10-05 18:31:13 +08:00
Jan Steemann 3b5d4a4fc9 issue #204: allow import of tab-separated values 
this enables the user to specify the tab as separator for arangoimp.
the separator and eol values used by arangoimp can now also consist of
more than one character.

updated documentation and added test cases
 2012-09-30 01:38:32 +02:00
Oreste Panaia 6bdf3ae565 usual mysteries with git 
Conflicts:
	lib/Rest/Endpoint.cpp
 2012-09-28 17:56:05 +08:00
Oreste Panaia 2a71a3c371 minor changes for windows compatability 2012-09-28 17:34:22 +08:00
Oreste Panaia a4d551653d Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-09-26 19:11:18 +08:00
Oreste Panaia ba63b36b53 With git you never know 2012-09-26 19:10:48 +08:00
a-brandt e957c99b14 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-09-26 12:39:09 +02:00
a-brandt 03249fc953 fixed warning 2012-09-26 12:38:34 +02:00
a-brandt 04308d6cb6 bugfix: zero length strings 2012-09-26 09:26:58 +02:00
Jan Steemann 0a2466fdd6 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-09-26 08:44:39 +02:00
Jan Steemann 89754433dd switched to C mersenne twister implementation in BasicsC 2012-09-25 22:57:47 +02:00
Jan Steemann 10d6167d45 removed some unused compile options 2012-09-25 21:24:02 +02:00
Jan Steemann 01d0089e51 some minor optimisations for json to string conversion 2012-09-25 18:34:36 +02:00
Jan Steemann ce3936df9a some cleanup 2012-09-25 16:12:20 +02:00
Jan Steemann 89cffbe083 set log level to info (which is the default otherwise) for unknown log levels 2012-09-24 16:59:35 +02:00
a-brandt fe7f2f8079 ICU changes 2012-09-24 11:40:06 +02:00
Frank Celler e9b1e1c58f Merge branch '1.0' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	3rdParty/mruby/include/mrbconf.h
	3rdParty/mruby/include/mruby.h
	3rdParty/mruby/include/mruby/array.h
	3rdParty/mruby/include/mruby/khash.h
	3rdParty/mruby/include/mruby/object.h
	3rdParty/mruby/include/mruby/variable.h
	3rdParty/mruby/mrblib/error.rb
	3rdParty/mruby/mrblib/print.rb
	3rdParty/mruby/src/array.c
	3rdParty/mruby/src/cdump.c
	3rdParty/mruby/src/class.c
	3rdParty/mruby/src/codegen.c
	3rdParty/mruby/src/error.c
	3rdParty/mruby/src/gc.c
	3rdParty/mruby/src/init.c
	3rdParty/mruby/src/kernel.c
	3rdParty/mruby/src/math.c
	3rdParty/mruby/src/numeric.c
	3rdParty/mruby/src/object.c
	3rdParty/mruby/src/parse.y
	3rdParty/mruby/src/pool.c
	3rdParty/mruby/src/proc.c
	3rdParty/mruby/src/range.c
	3rdParty/mruby/src/sprintf.c
	3rdParty/mruby/src/state.c
	3rdParty/mruby/src/string.c
	3rdParty/mruby/src/struct.c
	3rdParty/mruby/src/symbol.c
	3rdParty/mruby/src/time.c
	3rdParty/mruby/src/variable.c
	3rdParty/mruby/src/vm.c
	3rdParty/mruby/src/y.tab.c
	3rdParty/mruby/test/assert.rb
	3rdParty/mruby/test/t/array.rb
	3rdParty/mruby/test/t/exception.rb
	3rdParty/mruby/test/t/kernel.rb
	3rdParty/mruby/test/t/math.rb
	3rdParty/mruby/test/t/module.rb
	3rdParty/mruby/test/t/string.rb
	3rdParty/mruby/test/t/struct.rb
	3rdParty/mruby/test/t/time.rb
	3rdParty/mruby/tools/mirb/mirb.c
	3rdParty/mruby/tools/mruby/mruby.c
	Doxygen/arango-html.doxy
	Doxygen/arango.template
	Makefile.am
	Makefile.in
	UnitTests/HttpInterface/api-http-spec.rb
	aclocal.m4
	arangod/RestHandler/RestDocumentHandler.cpp
	arangod/RestServer/ArangoServer.cpp
	arangod/V8Server/ApplicationV8.cpp
	arangod/V8Server/ApplicationV8.h
	arangod/V8Server/v8-actions.cpp
	arangod/V8Server/v8-query.cpp
	arangod/V8Server/v8-vocbase.cpp
	arangod/V8Server/v8-vocbase.h
	arangod/VocBase/compactor.c
	arangod/VocBase/compactor.h
	arangod/VocBase/shadow-data.c
	arangod/VocBase/simple-collection.c
	arangod/VocBase/simple-collection.h
	arangod/VocBase/synchroniser.c
	arangod/VocBase/vocbase.c
	arangoirb/MRClient/arangoirb.cpp
	config/compile
	config/depcomp
	config/install-sh
	config/missing
	configure
	js/actions/demo/geo.js
	js/actions/demo/hallo-world.js
	js/actions/system/api-collection.js
	js/actions/system/api-edges.js
	js/actions/system/api-system.js
	js/actions/system/documents.js
	lib/BasicsC/locks-posix.c
	lib/BasicsC/operating-system.h
	lib/HttpServer/HttpCommTask.cpp
	lib/HttpServer/HttpCommTask.h
	lib/MRuby/MRLineEditor.cpp
	lib/MRuby/mr-utils.c
	m4/Makefile.doxygen
	m4/all-in-one.mruby
 2012-09-20 16:39:59 +02:00
Frank Celler b191e9c464 Merge pull request #199 from triAGENS/1.0 
1.0
 2012-09-19 05:35:53 -07:00
Oreste Panaia f5316acb9d Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 
Conflicts:
	arangod/Ahuacatl/ahuacatl-grammar.c
	arangod/V8Server/v8-vocbase.cpp
	arangod/VocBase/document-collection.c
	arangod/VocBase/document-collection.h
 2012-09-17 22:40:12 +08:00
Oreste Panaia c7e5eae52d Added additional error numbers for bitarray index creation 2012-09-17 19:57:10 +08:00
a-brandt 4e2cbfbb15 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-09-17 09:51:21 +02:00
a-brandt 3666069569 Added UTF8/UTF16 normalize and compare functions (uses libicu) 2012-09-17 09:49:41 +02:00
Jan Steemann f7e98df4a3 removed unused error codes 2012-09-14 15:18:28 +02:00
Jan Steemann 9bc99b7c9d renamed document collection to primary collection 2012-09-14 10:19:41 +02:00
a-brandt fc2ab446fa Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-09-14 09:19:42 +02:00
Frank Celler 4cb179cad5 Merge branch 'master' of github.com:triAGENS/ArangoDB into devel 2012-09-13 22:16:31 +02:00
Frank Celler 5ffae32016 fix path and removed duplicate const 2012-09-13 21:19:09 +02:00
a-brandt db00ed1502 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-09-13 17:47:48 +02:00
Jan Steemann a932d335cb added guards for collection locking and read/write transactions 2012-09-13 17:40:38 +02:00
a-brandt ccdc384fdf Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 
Conflicts:
	lib/BasicsC/strings.c
 2012-09-13 16:45:05 +02:00
a-brandt 4dc64a546b added utf8 normalization function (uses icu) 2012-09-13 16:41:00 +02:00
Frank Celler 49b19e4657 Merge branch 'devel' of github.com:triAGENS/ArangoDB 
Conflicts:
	lib/BasicsC/terminal-utils-posix.c
	lib/BasicsC/terminal-utils.c
	lib/SimpleHttpClient/SimpleHttpResult.cpp
 2012-09-12 23:49:14 +02:00
Frank Celler e8089d86a7 removed user manager 2012-09-12 23:37:39 +02:00