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

310 Commits

Author SHA1 Message Date
a-brandt c2d0749178 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 
Conflicts:
	arangod/RestHandler/RestDocumentHandler.cpp
	arangod/RestHandler/RestEdgeHandler.cpp
	arangod/RestHandler/RestImportHandler.cpp
	arangod/V8Server/v8-vocbase.cpp
	arangod/VocBase/document-collection.c
	arangod/VocBase/document-collection.h
	arangod/VocBase/primary-collection.c
	arangod/VocBase/primary-collection.h
 2012-10-24 10:46:38 +02:00
a-brandt 9a599e468a added "_key" attribute 2012-10-23 15:58:09 +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 8684b2630d fixed a crash with --database.force-sync-shapes = false 2012-10-17 18:46:46 +02:00
Frank Celler 3aebed3020 Merge branch '1.1' of github.com:triAGENS/ArangoDB into 1.1 
Conflicts:
	Documentation/Makefile.files
 2012-10-17 18:03:46 +02:00
Frank Celler 1efad1d9c7 fixed file permissions 2012-10-17 18:01:57 +02:00
Jan Steemann d58c48bdd8 fix rollback of edge update 
The rollback of edge marker modification used a wrong marker size and thus uninitialised memory.
Achim found this
 2012-10-17 17:25:12 +02:00
Jan Steemann be54759314 issue #245 2012-10-17 14:24:31 +02:00
Jan Steemann c5996869b6 hash index fixes 2012-10-16 17:43:22 +02:00
Jan Steemann 94057c0d0a sizeof(hash element) /= 2 2012-10-16 13:48:03 +02:00
Jan Steemann 8cad4ff0a8 suppress excessive log spam 2012-10-16 10:27:59 +02:00
Jan Steemann 95006138ed put parameters on individual lines 2012-10-15 11:31:00 +02:00
Jan Steemann eba0456c05 added some memory checks 2012-10-11 15:49:20 +02:00
Jan Steemann de853fda66 fixed error message 2012-10-11 14:56:34 +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
Jan Steemann 22c1252a4f moved some edge collection stuff to edge-collection.* 2012-10-10 14:05:06 +02:00
Jan Steemann 95ff3178a6 remove useless includes 2012-10-10 12:39:10 +02:00
Jan Steemann dca19fcd32 move edge-related functionality to file of its own 2012-10-10 11:42:52 +02:00
Jan Steemann 6847caac80 changed misleading member name (secondaryIndexes => allIndexes) 2012-10-10 11:24:36 +02:00
Jan Steemann 29b1877abd removed createHeader and updateHeader dynamic functions 
Those are only necessary in the document collection and the document collection can safely call its own static functions. no need for function pointers
 2012-10-09 16:59:02 +02:00
Frank Celler f7c990ce1a Merge pull request #216 from jsteemann/issue213 
possible implementation for issue #213
 2012-10-09 07:51:15 -07:00
Oreste Panaia fbd74b3569 windows 2012-10-08 23:30:30 +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 e51656767e possible implementation for issue #213 2012-10-04 15:04:20 +02:00
Jan Steemann 017965365a put arguments onto individual lines 2012-10-04 13:17:58 +02:00
Jan Steemann 134449d872 make the compiler happy when compiling with --disable-logger 2012-09-28 15:10:59 +02:00
Oreste Panaia 2a71a3c371 minor changes for windows compatability 2012-09-28 17:34:22 +08: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
Oreste Panaia bd8bebed86 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-09-19 15:21:26 +08:00
Oreste Panaia 43ee2e1a58 unittests 2012-09-19 15:19:39 +08:00
a-brandt 3019983dc7 ICU changes 2012-09-18 10:41:37 +02: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
Jan Steemann b8cc79296b some simplification 2012-09-17 12:15:01 +02:00
Jan Steemann 3d6dfb6042 indentation 2012-09-17 11:54:52 +02:00
Jan Steemann 76674bad52 moved primaryIndex and lock from document-collection to primary-collection 2012-09-17 11:43:48 +02:00
Jan Steemann 1ef037ce8c renamed indexes to secondaryIndexes 2012-09-17 09:54:12 +02:00
Jan Steemann 7c4b13f19d slightly simplified locking 2012-09-17 09:05:13 +02:00
Jan Steemann f7e98df4a3 removed unused error codes 2012-09-14 15:18:28 +02:00
Jan Steemann 07ccc2083b further renamings 2012-09-14 14:57:26 +02:00
Jan Steemann 1b1d7ba877 renamed simple_collection to document_collection 2012-09-14 14:46:37 +02:00
Jan Steemann 9bc99b7c9d renamed document collection to primary collection 2012-09-14 10:19:41 +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
Jan Steemann 1906f9c36b don't fail in case of EAGAIN rwlock acquisition, fixed locks error logging 2012-09-12 13:56:30 +02:00
Jan Steemann daa43b467a fixed dead-locking 2012-09-12 13:40:10 +02:00
Jan Steemann d670fbca5b issue #150, issue #188 2012-09-12 09:32:25 +02:00
Jan Steemann 9a58ffbb2d avoid deadlocking between synchroniser, compactor and data modification threads (e.g. POST /_api/document) 2012-09-12 09:07:51 +02:00
Jan Steemann 3ae11903e8 fixed a deadlock between compactor, synchroniser, and data modification threads (e.g. POST /_api/document) 2012-09-12 00:57:12 +02:00
Jan Steemann d4d2656364 no complaining about "lock" file 2012-09-11 18:11:27 +02:00
Jan Steemann b24ee5aab4 issue #194: potential race condition between creating and dropping collections 2012-09-11 17:15:46 +02:00
Jan Steemann b6c46979f5 downgraded write-lock to a read-lock 2012-09-11 16:31:13 +02:00
Jan Steemann 31676da1ff made deletion of cursors an atomic operation 2012-09-11 16:30:23 +02:00
Jan Steemann cfe44acda4 moved variable to top-level scope. otherwise bad(TM) things may happen 2012-09-11 10:45:47 +02:00
Jan Steemann 65fb4fa84f less long locking 2012-09-11 09:45:58 +02:00
Jan Steemann 41bdeeecdd minor message change 2012-09-11 08:54:52 +02:00
Jan Steemann 4587d5db3c added configure option --enable-lock-check 2012-09-10 18:17:57 +02:00
Jan Steemann 336195dff5 more verbosity in trace mode 2012-09-10 18:15:16 +02:00
Oreste Panaia f93eef34d7 git 
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel

Conflicts:
	lib/ShapedJson/json-shaper.c
 2012-09-10 20:53:41 +08:00
Jan Steemann c0268ce475 try to avoid duplicate read-locking from AQL queries 2012-09-10 14:44:29 +02:00
Oreste Panaia 6134497b5d Merge https://github.com/triAGENS/ArangoDB into devel 2012-09-10 20:42:48 +08:00
Oreste Panaia 8847d87580 added limited AQL support for bit indexes 2012-09-10 20:42:14 +08:00
Jan Steemann fde8af7b2f do not ignore out of memory 2012-09-07 17:46:32 +02:00
Jan Steemann 6a17f7c1e8 do not ignore out-of-memory 2012-09-07 17:44:19 +02:00
Jan Steemann 559b0f9767 do not ignore oom cases 2012-09-07 17:43:00 +02:00
Jan Steemann 451487fd68 fixed locking issues 2012-09-07 17:24:47 +02:00
Jan Steemann 112019c7e2 fixed some locking issues 2012-09-07 17:18:16 +02:00
Jan Steemann 7626972890 issue #155 2012-09-06 17:48:06 +02:00
Jan Steemann 2072bb6fb8 improved debug logging and early deletion of cursor 2012-09-06 17:46:15 +02:00
Jan Steemann 743efe30a7 some minor cleanups 2012-09-06 14:03:07 +02:00
Jan Steemann 7a20b188ba issue #188 2012-09-06 13:35:01 +02:00
Jan Steemann 37914fcf34 issue #188, issue #150: introduce periodic garbage collection for V8 contexts, fix issue with server-side cursor refcounts 2012-09-06 11:37:01 +02:00
Jan Steemann 22f860d9db some obvious cleanups 2012-09-06 10:03:11 +02:00
Jan Steemann c973adc724 reduce log file spamming in case when running out of file descriptors 2012-09-05 16:56:07 +02:00
Jan Steemann 6a4c9c1c07 fixed potential crash when parameter file cannot be created 2012-09-05 11:43:57 +02:00
Jan Steemann 55907a5548 fixed potential crash when parameter file cannot be created 2012-09-05 11:42:23 +02:00
Jan Steemann 0712114f27 fixed potential crash in case parameter file cannot be created 2012-09-05 11:41:34 +02:00
Jan Steemann febd5bfa8e removed member TRI_doc_mptr_t->_document 2012-09-04 13:20:01 +02:00
Jan Steemann 95db9cf429 removed some dead code 2012-09-04 10:05:36 +02:00
Jan Steemann c1ebdabcf3 renamed blob_collection to shape_collection 2012-09-04 09:32:18 +02:00
Jan Steemann 9ff624c2d2 had to change collection version from 1 to 2 because the "status" attribute now may have a different meaning than before 2012-09-03 17:09:25 +02:00
Jan Steemann 64cb6d63e0 removed attachment collection type 2012-09-03 16:56:13 +02:00
Jan Steemann e40b84d33e fixed typos in documentation 2012-09-03 16:37:44 +02:00
Jan Steemann 67dd26fcef removed previous implementation of attachments 2012-09-03 16:21:47 +02:00
Oreste Panaia d632fb820b Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-09-03 17:09:00 +08:00
Oreste Panaia b7d239f629 draft index interface 2012-09-03 17:05:39 +08:00
Frank Celler 8b34bbb9de fixed permission 2012-08-31 08:59:59 +02:00
Jan Steemann ed395ab8ce issue #153 2012-08-28 13:06:04 +02:00
Jan Steemann b8e7d5634d issue #153: edge collection should be a flag for a collection 2012-08-28 10:48:24 +02:00
Jan Steemann 36add37fae added markers for attachments, but they are still unused 2012-08-27 14:12:14 +02:00
Jan Steemann 2e32fe9c2f added comments 2012-08-27 13:53:38 +02:00
Jan Steemann 04cacc4e32 fixed a typo in a comment 2012-08-27 13:51:39 +02:00
Jan Steemann d55807aa83 fixed an out of memory case 2012-08-21 16:59:52 +02:00
Jan Steemann 1126c8fa06 issue #163 2012-08-21 14:19:45 +02:00
Jan Steemann ff973f399c issue #163 2012-08-21 13:04:39 +02:00
Jan Steemann 2c50c51e12 issue #163: remove dangling temp file so collections can be created 2012-08-21 13:02:22 +02:00
Jan Steemann 291d3fbc64 issue #108: speed up truncate operation 2012-08-20 11:13:01 +02:00
Jan Steemann ea863bdf70 issue #152: fix memleak for barriers 2012-08-14 16:03:12 +02:00
Jan Steemann 8a1e88c3c1 issue #152: fixed memleak for barriers 2012-08-14 15:14:18 +02:00
Jan Steemann ea186b8671 issue #151: fixed memleak 2012-08-14 14:21:03 +02:00
Jan Steemann ee63680c57 issue #151: memleak when compactifying collections 2012-08-14 10:34:05 +02:00
Jan Steemann 96bec65c36 avoid additional sync() calls when writing partial shape data (attribute data) to disk. sync() can still be called when the shape marker is written to disk (will come after all attributes are written). 2012-08-10 12:10:53 +02:00
Jan Steemann 43b7ea951a issue #147: added --database.force-sync-shapes option 2012-08-09 19:25:39 +02:00
Frank Celler 69a8e64f9b Merge branch 'master' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	.gitignore
	Makefile.in
	Makefile.local
	Makefile.unittests
 2012-08-09 15:25:29 +02:00
Frank Celler 5e84fb02e8 added reference to caller 2012-08-08 15:32:54 +02:00
Jan Steemann 982781ec3e reduced sleep intervals 2012-08-08 14:51:00 +02:00
Jan Steemann 2ac79d2298 added TODO marker 2012-08-08 09:55:18 +02:00
Jan Steemann c5addc1020 added TODO markers for OOM cases 2012-08-08 09:48:03 +02:00
Frank Celler 250eee38cc Merge pull request #140 from jsteemann/index 
issue #136: adjusted message during indexing
 2012-08-07 07:48:09 -07:00
Jan Steemann 3d53f45d57 removed some TODO markers by handling some out of memory situations 2012-08-07 10:03:21 +02:00
Jan Steemann d0c9469dd9 issue #136: adjusted message during indexing 2012-08-06 18:14:57 +02:00
Frank Celler b0e452f74a Merge branch 'master' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	CHANGELOG
	Makefile.am
	Makefile.in
	arangod/V8Server/v8-vocbase.cpp
 2012-08-02 17:17:36 +02:00
Oreste Panaia b798b1d53f Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 
Conflicts:
	arangod/BitIndexes/bitarray.c
 2012-08-02 15:28:49 +08:00
Oreste Panaia 03cce62c3a bitarray index now support explicit values 2012-08-02 15:20:43 +08:00
Frank Celler 325a4d59bb datafile check 2012-07-28 20:57:03 +02:00
Frank Celler 818b6d9ec2 datafile debugger 2012-07-28 09:32:45 +02:00
Jan Steemann eeeb78c2e7 Merge branch '1.1' of https://github.com/triAGENS/ArangoDB into devel 
Conflicts:
	CHANGELOG
	Installation/arangod.conf.in
	Makefile.in
	arangod/Makefile.files
	arangod/RestHandler/RestBatchHandler.cpp
	arangod/RestHandler/RestBatchHandler.h
	arangod/RestServer/ArangoServer.cpp
	bin/arango-password.in
 2012-07-26 12:03:03 +02:00
Jan Steemann 7a0e9d350d added documentation for endpoints, disable-authentication, fixed tests 2012-07-26 09:10:59 +02:00
Frank Celler b2a334a063 added datafile map for collection 2012-07-25 20:56:34 +02:00
Frank Celler 5aacb31226 removed TRI_IndexSimCollection (locking was broken for this function) 2012-07-25 16:47:50 +02:00
Frank Celler 041eb53b10 Merge branch '1.0' of github.com:triAGENS/ArangoDB into 1.1 
Conflicts:
	Makefile.in
	arangod/RestServer/ArangoServer.cpp
	arangoirb/MRClient/arangoirb.cpp
	lib/GeneralServer/GeneralServer.h
	lib/HttpServer/ApplicationHttpServer.cpp
	lib/HttpServer/HttpCommTask.cpp
	lib/HttpServer/HttpHandler.cpp
	lib/HttpServer/HttpHandlerFactory.cpp
	lib/HttpServer/HttpHandlerFactory.h
	lib/HttpsServer/ApplicationHttpsServer.cpp
 2012-07-24 22:19:46 +02:00
Frank Celler f126016484 added ExtractShapedJsonVocShaper 2012-07-16 15:42:41 +02:00
Frank Celler a02faec3a3 added basic authentication 2012-07-15 17:06:59 +02:00
Frank Celler b1aac93853 fixed warnings 2012-07-14 23:18:33 +02:00
Frank Celler 191b1338fe issue #98: Unable to change journalSize 2012-07-11 13:42:17 +02:00
Frank Celler e455348032 added --database.wait-for-sync 2012-07-10 16:34:06 +02:00
Frank Celler de187b1625 added wake-up call for synchroniser 2012-07-10 15:06:34 +02:00
Frank Celler 4c517c6d3c removed exec flag 2012-07-10 10:46:20 +02:00
Frank Celler 08ff930154 Merge branch 'devel' of github.com:triAGENS/ArangoDB 2012-07-09 14:24:38 +02:00
Frank Celler 1fe03464c2 Merge branch 'devel' of github.com:triAGENS/ArangoDB into 1.1 2012-07-05 15:42:12 +02:00
Oreste Panaia 67d6b7fca0 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-07-05 13:59:46 +08:00
Oreste Panaia c72f44c949 Bitarray indexes update 2012-07-05 13:59:26 +08:00
Jan Steemann ef01fa3c4e added OOM guard 2012-07-04 13:50:35 +02:00
Jan Steemann fe1ac7aebb issue #121: added more output to the figures() API call 2012-07-04 12:15:16 +02:00
Jan Steemann 570b47f649 honor option --database.maximal-journal-size 2012-07-03 17:09:35 +02:00
Frank Celler d3e2bca5ff Merge branch 'master' of github.com:fceller/ArangoDB into 1.1-stat 2012-07-02 18:47:33 +02:00
Frank Celler 237968ba26 cosmetics 2012-07-02 18:44:03 +02:00
Frank Celler 4e82d631c2 fixed memleak 2012-07-01 14:34:03 +02:00
Oreste Panaia 4ea30529ba Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-06-29 14:28:10 +08:00
Oreste Panaia 2e3b6531c8 Some fixes for bitarray indexes 2012-06-29 14:27:30 +08:00
Jan Steemann c4db88bdea fixed doxygen errors 2012-06-27 13:22:40 +02:00
Oreste Panaia a9f9c3af55 trying to upload bitarrays 2012-06-27 14:21:21 +08:00
Oreste Panaia 43309908ec Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 
Conflicts:
	arangod/BitIndexes/bitarray.c
	arangod/RestServer/ArangoServer.cpp
	configure
 2012-06-26 20:41:04 +08:00
Oreste Panaia 20bbdab435 Bitarray index first draft 2012-06-26 20:05:49 +08:00
Frank Celler 4e6f4a74a6 fixed memory leaks 2012-06-22 13:38:55 +02:00
Jan Steemann 0bb547b8f9 call UpdateTickVocbase() for both document and revision id 2012-06-22 12:45:08 +02:00
Jan Steemann 5a74e95f35 allow reusing ids and revision when creating collections and documents 2012-06-19 15:50:52 +02:00
Frank Celler 0c9683fb8d Merge branch 'devel' of github.com:triAGENS/ArangoDB 
Conflicts:
	Makefile.in
 2012-06-14 15:04:33 +02:00
Oreste Panaia 9949c9e75c renamed sl-operator.c and sl-operator.h to index-operator.c and index-operator.h respectively 2012-06-14 10:04:41 +08:00
Frank Celler 79449d5d71 Merge branch 'devel' of github.com:triAGENS/ArangoDB 
Conflicts:
	arangod/Ahuacatl/ahuacatl-grammar.c
 2012-06-13 11:40:35 +02:00
Frank Celler 73e50d932f added name for pthreads 2012-06-13 00:12:45 +02:00
Jan Steemann 4ec362fc8f some optimiser stuff 2012-06-12 09:36:58 +02:00
Jan Steemann efd48664ef Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 
Conflicts:
	Ahuacatl/ahuacatl-statement-dump.c
	Ahuacatl/ahuacatl-statement-dump.h
	Ahuacatl/ahuacatl-statementlist.c
	Ahuacatl/ahuacatl-tree-dump.c
	Ahuacatl/ahuacatl-tree-dump.h
	Ahuacatl/ahuacatl-tree-walker.h
	Makefile.files
	Makefile.in
	arangod/Ahuacatl/ahuacatl-tree-dump.c
	arangod/Ahuacatl/ahuacatl-tree-dump.h
	arangod/Ahuacatl/ahuacatl-tree-walker.c
	arangod/Ahuacatl/ahuacatl-tree-walker.h
 2012-06-08 17:34:20 +02:00
Frank Celler 313c3c31ed Merge branch '1.0' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	arangod/RestServer/ArangoServer.cpp
	arangosh/V8Client/arangosh.cpp
 2012-06-08 15:13:01 +02:00
Frank Celler d2c758d663 the great rename 2012-06-08 15:01:25 +02:00