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

15092 Commits

Author SHA1 Message Date
Jan Steemann 3b7b14454c added abstract EndpointServer, starting to combine ApplicationHttpServer and ApplicationHttpsServer 2012-07-27 15:38:27 +02:00
Jan Steemann c602be9ad2 added tests for ssl and unix socket endpoints 2012-07-27 10:47:03 +02:00
Jan Steemann eaeb9b42da completed documentation for ssl options 2012-07-26 15:09:26 +02:00
Jan Steemann daa6ca8b5e added documentation for ssl options 2012-07-26 13:39:21 +02:00
Jan Steemann 1f62715e87 fixed documentation 2012-07-26 12:49:25 +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 7036501641 added documentation 2012-07-26 09:49:59 +02:00
Jan Steemann cc81db31a8 doxygen fixes 2012-07-26 09:46:22 +02:00
Jan Steemann cc9952f460 fixed documentation 2012-07-26 09:22:52 +02:00
Jan Steemann 7a0e9d350d added documentation for endpoints, disable-authentication, fixed tests 2012-07-26 09:10:59 +02:00
Jan Steemann 4f2229124f added --server.disable-authentication option 2012-07-26 08:49:56 +02:00
Frank Celler b2a334a063 added datafile map for collection 2012-07-25 20:56:34 +02:00
Jan Steemann c99dcc6357 fixed a doxygen error 2012-07-25 17:57:10 +02:00
Jan Steemann ae47eb4da8 added documentation 2012-07-25 17:52:21 +02:00
Jan Steemann 8d8044ba47 added proper SSL support for arangosh and arangoimp 2012-07-25 17:47:54 +02:00
Frank Celler 5aacb31226 removed TRI_IndexSimCollection (locking was broken for this function) 2012-07-25 16:47:50 +02:00
Frank Celler 97ff940736 fixed merge 2012-07-24 23:07:31 +02:00
Frank Celler 4605fbba9a Merge branch '1.1' of github.com:triAGENS/ArangoDB into 1.1 
Conflicts:
	CHANGELOG
	Doxygen/Examples.ArangoDB/startup1
	Makefile.in
	arangod/Documentation/command-line-options.dox
	arangod/Documentation/install-manual.dox
	arangod/Makefile.files
	arangod/RestServer/ArangoServer.cpp
	arangod/VocBase/auth.h
	arangosh/V8Client/arangosh.cpp
	html/admin/css/layout.css
	lib/Basics/ssl-helper.h
	lib/HttpServer/ApplicationHttpServer.cpp
	lib/HttpServer/ApplicationHttpServer.h
	lib/HttpServer/HttpServer.cpp
	lib/HttpsServer/ApplicationHttpsServer.cpp
	lib/HttpsServer/ApplicationHttpsServer.h
 2012-07-24 22:56:03 +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
Jan Steemann 537fb48aff allow admin interface via HTTPS 2012-07-24 09:48:13 +02:00
Oreste Panaia 53e4fb7f12 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 
Conflicts:
	arangod/BitIndexes/bitarray.c
	arangod/BitIndexes/bitarrayIndex.c
 2012-07-24 14:56:04 +08:00
Jan Steemann a8cf75b245 minor cleanup 2012-07-24 08:43:38 +02:00
Jan Steemann a910971b15 fixed documentation & installation settings after endpoint introduction 2012-07-24 08:42:45 +02:00
Oreste Panaia cd5ed3ac67 added http support for bitarray idnex creation 2012-07-24 14:30:38 +08:00
Jan Steemann 33839809ab ssl 2012-07-23 18:17:45 +02:00
Jan Steemann 9a72ea4496 added https@ and http@ endpoints, https still unfinished 2012-07-23 17:32:59 +02:00
Jan Steemann abc516f429 removed dead member variable 2012-07-23 16:00:12 +02:00
Jan Steemann c079eda53b fixed doxygen errors 2012-07-23 15:24:53 +02:00
Jan Steemann 4e6c8024f6 added support for unix sockets, switched connection strings to endpoint syntax 2012-07-23 13:54:35 +02:00
Jan Steemann 53e8581b99 added ifdef around zeromq stuff 2012-07-20 15:07:53 +02:00
Jan Steemann 8cfba96f28 removed option --server.admin-port 2012-07-20 15:05:18 +02:00
Jan Steemann dc91c9fcac fixed clang warnings 2012-07-20 13:06:51 +02:00
Jan Steemann 0dd0245ac4 fixed clang compile warnings and errors 2012-07-20 13:00:28 +02:00
a-brandt 33f38daafc Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2012-07-18 16:51:07 +02:00
a-brandt c65ccb5b5d added checks for empty objects 2012-07-18 16:49:24 +02:00
Lucas Dohmen 17fd5f6afe Merge branch 'graph_algorithms' into devel 2012-07-18 16:41:27 +02:00
Jan Steemann 0b7ae1d728 moved options 2012-07-18 16:40:47 +02:00
Jan Steemann 73778300f1 moved options from help-admin to help-devel 2012-07-18 16:35:10 +02:00
Lucas Dohmen 83bd2af811 Merge branch 'devel' into graph_algorithms 2012-07-18 16:12:21 +02:00
Jan Steemann 8620bffa84 renamed a lock 2012-07-17 18:18:24 +02:00
Frank Celler dc05fc3562 Amazon Micro Instance 2012-07-17 17:16:01 +02:00
Jan Steemann 0ce6e565c8 clearly note who finalised a batch job 2012-07-17 16:56:52 +02:00
Jan Steemann 4904374cb9 intermediate version 2012-07-17 16:05:46 +02:00
Jan Steemann 6a4cb8625f further implementation of batch processing, still has segfaults 2012-07-16 17:53:04 +02:00
Frank Celler 85e0e70e2e fixed flag 2012-07-16 16:21:28 +02:00
Frank Celler f126016484 added ExtractShapedJsonVocShaper 2012-07-16 15:42:41 +02:00
Frank Celler 08ee82ec82 Merge branch '1.0' of github.com:triAGENS/ArangoDB 2012-07-16 15:16:27 +02:00
Frank Celler f589a384c3 Merge branch 'master' of github.com:triAGENS/ArangoDB into 1.0 2012-07-16 14:12:35 +02:00
a-brandt 183a9cd21d added repositories 2012-07-16 13:55:02 +02:00
Frank Celler 16407018d7 fixed relative paths 2012-07-16 13:45:13 +02:00
Jan Steemann 83f018e9ad batch job code can now be compiled without errors but still does not work 2012-07-16 13:23:39 +02:00
Jan Steemann 20ee770a91 removed batch handler in devel version 2012-07-16 09:44:16 +02:00
Frank Celler f7e1388e93 updated documentation 2012-07-15 17:31:59 +02:00
Frank Celler a02faec3a3 added basic authentication 2012-07-15 17:06:59 +02:00
Frank Celler 1df2799005 added --javascript.script 
renamed --unit-tests to --javascript.unit-tests
 2012-07-15 00:50:05 +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 ce7eb8b40e Merge branch 'devel' of github.com:triAGENS/ArangoDB 2012-07-11 11:27:00 +02:00
Frank Celler 24ead07956 clearified documentation, fixed paths for binary 2012-07-11 11:25:18 +02:00
Frank Celler 5ffff9edc4 added process title for supervisor 2012-07-11 10:46:04 +02:00
Frank Celler 9c92948872 Merge branch 'master' of https://github.com/fceller/ArangoDB into devel 2012-07-10 18:28:19 +02:00
Frank Celler be5bd3108b Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2012-07-10 18:28:08 +02:00
Frank Celler 58d29a78ef fixed privileges 2012-07-10 18:27:50 +02:00
Jan Steemann f960ac0df0 issue #124: added missing documentation 2012-07-10 17:07:49 +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 ab4d52963e fixed statistics: no deviation for request-statistics, distribution for connection-statistics 2012-07-09 15:24:28 +02:00
Frank Celler 08ff930154 Merge branch 'devel' of github.com:triAGENS/ArangoDB 2012-07-09 14:24:38 +02:00
Oreste Panaia 224614f14a Bitarray index fixes 2012-07-06 12:02:08 +08:00
Frank Celler ab306f7f4b added connection-statistics 2012-07-05 22:08:21 +02:00
Frank Celler 56bdef98b8 added ConnectionStatisticsHandler 2012-07-05 18:02:43 +02:00
Frank Celler 4403da5568 added base class 2012-07-05 17:59:42 +02:00
Frank Celler 957bc347dc added connection statistics 2012-07-05 17:48:12 +02:00
Frank Celler c1892ff9b4 added doc for request statistics 2012-07-05 16:42:49 +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
Frank Celler 0b7c4ecee2 added all 2012-07-04 22:54:04 +02:00
Frank Celler 795b2a9178 added statistics 2012-07-04 18:33:13 +02:00
Jan Steemann ef01fa3c4e added OOM guard 2012-07-04 13:50:35 +02:00
Jan Steemann f7be68bd47 updated documentation for issue #121 2012-07-04 13:13:38 +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
Jan Steemann 089ac79989 added server startup option --server.disable-admin-interface 2012-07-03 13:22:03 +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 9e1acf7a75 yesterday 2012-07-02 18:47:12 +02:00
Frank Celler 237968ba26 cosmetics 2012-07-02 18:44:03 +02:00
Frank Celler 0482963c7d Merge branch 'master' of github.com:fceller/ArangoDB into 1.1 2012-07-02 15:20:35 +02:00
Frank Celler fff2a9d656 cleanup mruby 2012-07-02 14:26:51 +02:00
Frank Celler af82d87ae5 added BatchJob and BatchSubjob 2012-07-02 11:18:44 +02:00
Frank Celler 4e82d631c2 fixed memleak 2012-07-01 14:34:03 +02:00
Frank Celler 479cb7b8b8 fixed shutdown 2012-07-01 14:10:01 +02:00
Frank Celler d0459a0851 new HttpServer & co implementation 2012-07-01 11:17:16 +02:00
Frank Celler fb4a7618e4 the great Scheduler & Dispatcher refactoring 2012-06-30 23:52:49 +02:00
Frank Celler 028d60a197 fixed python link 2012-06-30 14:17:22 +02:00
Frank Celler b0839ae8b1 fixed installtion paths 2012-06-30 11:12:06 +02:00
Frank Celler d69586beb0 fixed installation issures 2012-06-30 10:32:50 +02:00
Jan Steemann 3411a9b98c fixed a few query optimiser bugs, added test cases 2012-06-29 15:26:35 +02:00
Jan Steemann 586820f044 bug fixes for the query optimiser 2012-06-29 14:32:19 +02:00
Jan Steemann fa3b6a74fa fixed some range optimiser bugs, added test cases 2012-06-29 11:30:44 +02:00
Jan Steemann bafc974623 added test cases for range optimisation, fixed some range optimiser bugs 2012-06-29 10:23:04 +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 3f50cbc563 added example for --supervisor option 2012-06-27 18:11:39 +02:00
Jan Steemann 2cfcfe4e96 some cleanup 2012-06-27 15:37:50 +02:00
Jan Steemann 75bd9acfba fixed some things in the batch handler 2012-06-27 15:19:09 +02:00
Jan Steemann c4db88bdea fixed doxygen errors 2012-06-27 13:22:40 +02:00
Jan Steemann a7e3ac42b6 issue #116: fixed description of createCollection option 2012-06-27 13:19:33 +02:00
Jan Steemann 7dc6f77b69 some cleanup 2012-06-27 11:58:12 +02:00
Jan Steemann ad456ded93 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-06-27 09:53:58 +02:00
Jan Steemann 3981974d1d working, but still blocking batch processing implementation 2012-06-27 09:53:37 +02:00
Oreste Panaia cfbe3a84e3 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-06-27 14:34:38 +08:00
Oreste Panaia a9f9c3af55 trying to upload bitarrays 2012-06-27 14:21:21 +08:00
Jan Steemann aa282cfcf9 some cleanup to reduce diff size 2012-06-26 17:25:25 +02: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
Jan Steemann 12a5eb5e4e fixed clang warnings 2012-06-26 11:36:07 +02:00
Frank Celler ab66d178ed fixed comment 2012-06-24 21:16:42 +02:00
Frank Celler 3d0be30e0a fixed documentation 2012-06-24 20:26:32 +02:00
Frank Celler af60ebe612 fixed doc errors 2012-06-24 16:43:20 +02: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 c9b379f879 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-06-22 11:38:07 +02:00
Jan Steemann 92e73b1bb8 issue #112: do not accept document with duplicate attribute names 2012-06-22 11:36:48 +02:00
Frank Celler 70b8c415f7 Merge branch 'master' of github.com:fceller/ArangoDB 2012-06-22 11:00:30 +02:00
Frank Celler d3c17ee43f fixed ruby console and actions, now using now ApplicationMR class 2012-06-22 11:00:21 +02:00
Frank Celler 84ab9cdf3b fixed cleanup 2012-06-22 09:10:22 +02:00
Frank Celler 23f5b3d12d removed JavascriptActionDispatcherThread 2012-06-22 08:17:12 +02:00
Frank Celler f5ca96f10d deleted JavascriptDispatcherThread.h 2012-06-22 08:09:09 +02:00
Frank Celler 5fbd731838 moved 2012-06-21 23:20:02 +02:00
Frank Celler 37d3ad8dc2 Merge branch 'devel' of github.com:triAGENS/ArangoDB 
Conflicts:
	Makefile.in
	arangod/RestServer/ArangoServer.cpp
	arangod/RestServer/JavascriptDispatcherThread.cpp
	lib/Dispatcher/DispatcherQueue.cpp
	lib/HttpServer/HttpCommTask.cpp
 2012-06-21 23:17:48 +02:00
Jan Steemann 1bdd4c64e3 forgot to change Makefiles 2012-06-21 23:03:37 +02:00
Frank Celler b16d5e20ca fixed console 2012-06-21 23:02:12 +02:00
Frank Celler 94c954b8fd application v8 2012-06-21 22:40:11 +02:00
Jan Steemann 6a55a942fe potential fix for issue #111 (crash during make unittests) 2012-06-21 17:26:00 +02:00
Jan Steemann a0240aef31 renamed "shell" to "console" internally (as suggested by moonglum) 2012-06-21 16:39:22 +02:00
Jan Steemann f100e2ad82 changed async task handling 2012-06-21 16:32:54 +02:00
Frank Celler ea1243d3ce feature V8 2012-06-21 00:44:25 +02:00
Frank Celler 3fc8118904 cleanup ApplicationFeature 2012-06-20 20:52:15 +02:00
Frank Celler 0e7d6f8f2a added prepare and open 2012-06-19 23:20:33 +02:00
Frank Celler 8f16acdd86 added control to start & stop features 2012-06-19 22:12:49 +02:00
Frank Celler fffd1c4fc0 added log.filter 2012-06-19 17:30:08 +02:00
Frank Celler 1511e167aa Merge branch 'devel' of github.com:triAGENS/ArangoDB 
Conflicts:
	PerfTests/zclient.cpp
	lib/Dispatcher/DispatcherQueue.cpp
 2012-06-19 17:13:50 +02:00
Frank Celler a10151c26a added handler factory 2012-06-19 16:26:51 +02:00
Jan Steemann 5a74e95f35 allow reusing ids and revision when creating collections and documents 2012-06-19 15:50:52 +02:00
Oreste Panaia d9f7ba28cb Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-06-15 16:46:48 +08:00
Oreste Panaia 2add774ffa Fixed function name problem 2012-06-15 16:45:56 +08:00
Frank Celler c4369e97b2 fixed perm 2012-06-14 21:03:06 +02:00
Frank Celler 003680bb00 fixed type of parameters field 2012-06-14 20:53:40 +02:00
Frank Celler 0c9683fb8d Merge branch 'devel' of github.com:triAGENS/ArangoDB 
Conflicts:
	Makefile.in
 2012-06-14 15:04:33 +02:00
Frank Celler 704f921d0f new HttpRequest 2012-06-14 15:03:17 +02:00
Heiko Kernbach 3c32dd4cbb result not used 2012-06-14 11:19:50 +02:00
Jan Steemann 5bb8b5dd04 added explain output for collect statements 2012-06-14 10:09:03 +02:00
Jan Steemann 1ee6ec85ca added missing cases for (currently unsupported) bitarray indexes. shuts up compiler warnings 2012-06-14 09:37:46 +02:00
Oreste Panaia 32911e7d38 added index iterators and started on the bitarray indexes 2012-06-14 15:09:47 +08: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 02e8d7382f trying to get an abstact class for HttpRequest 2012-06-13 23:29:27 +02:00
Frank Celler 54826adb83 cleanup HttpRequest as prep for ZeroMQ 2012-06-13 21:51:27 +02:00
Jan Steemann 3a815e7e32 trying to fix some compiler warning 2012-06-13 16:55:39 +02:00
Jan Steemann e85a4b0a2f trying to fix some compiler warning 2012-06-13 16:54:34 +02:00
Frank Celler 1364ea8019 Merge branch 'devel' of github.com:triAGENS/ArangoDB 2012-06-13 15:06:32 +02:00
Jan Steemann 5b61e2008b fixed potential segfault on shutdown 2012-06-13 14:12:53 +02:00
Jan Steemann c27ca78769 added documentation for _api/query and _api/explain 2012-06-13 14:08:27 +02:00
Jan Steemann 7ad822bd09 fixed documentation 2012-06-13 13:42:46 +02:00
Jan Steemann e3a075057f reference accesses can now use indexes 2012-06-13 12:07:29 +02: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 3f5b54258b partial ZeroMQ integration 2012-06-13 11:39:00 +02:00
Frank Celler 73e50d932f added name for pthreads 2012-06-13 00:12:45 +02:00
Jan Steemann 3cb8b653cd 1st steps for reference access optimisations 2012-06-12 17:58:30 +02:00
Frank Celler 11e2a51e78 alternative version if mruby supports define_method and attrib_reader 2012-06-12 17:33:27 +02:00
Frank Celler dd7fa848c0 alternative version if mruby supports define_method and attrib_reader 2012-06-12 17:28:53 +02:00
Jan Steemann 2d7505a598 replace references that point to constant values with the constant values 2012-06-12 17:20:48 +02:00
Frank Celler 0a17415a01 preparations for ZeroMQ, removed Scheduler and Dispatcher from ApplicationServer 2012-06-12 17:11:12 +02:00
Jan Steemann 381fc2f9f9 optimiser change: collections are annotated with hints on how they are accessed. this info is picked up by the explain command 2012-06-12 16:50:36 +02:00
Jan Steemann 4ec362fc8f some optimiser stuff 2012-06-12 09:36:58 +02:00
Frank Celler 263a1c345c added protocol buffers 2012-06-11 17:58:05 +02:00
Jan Steemann d84193bce7 explain & optimizer 2012-06-11 17:55:09 +02:00
Jan Steemann 276a42630c explain 2012-06-11 16:39:39 +02:00
Jan Steemann 385f0fdf97 added AHUACATL_EXPLAIN() function 2012-06-11 14:22:12 +02:00
Jan Steemann bd60683228 explain command, 1st version, still unfinished 2012-06-11 13:36:11 +02:00
Jan Steemann 2e0edb9a79 added #ifdef, otherwise compilation fails 2012-06-11 12:06:30 +02:00
Jan Steemann 602a266fe8 removed superfluous call to strlen() 2012-06-11 08:35:22 +02:00
Frank Celler 02517f81fa Merge branch 'devel' of github.com:triAGENS/ArangoDB 
Conflicts:
	Makefile.in
	arangod/Ahuacatl/ahuacatl-grammar.c
	arangod/Ahuacatl/ahuacatl-grammar.h
	arangod/RestServer/JavascriptDispatcherThread.cpp
 2012-06-10 21:26:43 +02:00
Frank Celler d120aa0026 very rudimentary execute action method 2012-06-10 00:15:49 +02:00
Frank Celler bb9253eeff fixed queue handling for MRuby, added mount for MRuby and mr_action_t 2012-06-09 11:15:18 +02:00
Jan Steemann 12308b9664 fixed doxygen and wiki generation errors 2012-06-08 22:55:38 +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 55ebf00dbd Merge branch 'devel' of github.com:triAGENS/ArangoDB 
Conflicts:
	Actions/RestActionHandler.cpp
	Actions/RestActionHandler.h
	Makefile.files
	Makefile.in
	RestHandler/RestActionHandler.cpp
	RestHandler/RestActionHandler.h
	RestServer/ActionDispatcherThread.cpp
	RestServer/ActionDispatcherThread.h
	RestServer/RubyDispatcherThread.cpp
	RestServer/RubyDispatcherThread.h
	arangod/RestHandler/RestActionHandler.cpp
	arangod/RestHandler/RestActionHandler.h
	arangod/RestServer/ActionDispatcherThread.cpp
	arangod/RestServer/ActionDispatcherThread.h
	arangod/RestServer/ArangoServer.cpp
 2012-06-08 15:57:33 +02:00
Frank Celler efcfbccc7a the great rename IV 2012-06-08 15:25:16 +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