1
0
Fork 0
Commit Graph

134 Commits

Author SHA1 Message Date
Max Neunhoeffer 6b4bbe5d04 Fix a description of two methods. 2014-01-17 10:59:23 +01:00
Jan Steemann 4a805062bb changed internal APIs 2014-01-15 13:36:38 +01:00
Michael Hackstein 9f3479f5b6 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding
Conflicts:
	utils/Makefile.files
2014-01-10 17:41:52 +01:00
Jan Steemann 3309743c1a moved some collection parameters around 2014-01-07 11:02:49 +01:00
Jan Steemann 5571698555 serialize/unserialize collection data from agency 2014-01-03 19:04:50 +01:00
Frank Celler 84507cfc44 merged changes from 1.4 back to devel 2013-12-27 14:59:23 +01:00
Max Neunhoeffer a79c5801d8 Fix documentation of timeout unit. 2013-12-19 12:16:30 +01:00
Frank Celler f6b40b3395 added memchr and timezone for windows 2013-12-07 18:55:51 +01:00
Frank Celler 64bf0088b4 hopefully fixing wrong include ordering 2013-11-27 20:55:29 +01:00
Jan Steemann edb356f403 print warning message w/ reason 2013-11-21 23:57:51 +01:00
Jan Steemann 4f50b98c45 removed second logger implementation 2013-10-30 00:38:25 +01:00
Jan Steemann 9f312e6680 fixed thread shutdown (double detach) 2013-10-29 22:29:25 +01:00
Jan Steemann c751cc80fc issue #642 2013-10-29 21:15:46 +01:00
Jan Steemann 723785b5b6 Windows warnings 2013-10-29 10:09:12 +01:00
Jan Steemann 72a2a487d3 some fixes for issue #642 2013-10-28 14:34:37 +01:00
Jan Steemann f498f8f03c faster server shutdown 2013-10-18 10:18:46 +02:00
Jan Steemann 0a6148f2d6 fixed some VS complaints 2013-10-16 17:27:35 +02:00
Jan Steemann b8318609e2 updated arangorestore 2013-10-10 16:58:21 +02:00
Jan Steemann 46a295ba43 fixed some Windows warnings 2013-10-08 12:39:47 +02:00
Jan Steemann e3d9d95f3f Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
Conflicts:
	arangod/RestServer/ArangoServer.cpp
	lib/Admin/ApplicationAdminServer.cpp
	lib/GeneralServer/GeneralServerDispatcher.h
2013-09-26 17:46:05 +02:00
Jan Steemann a525dab0c4 cleanup 2013-09-26 17:27:42 +02:00
Jan Steemann 106fedd615 several errors fixed 2013-09-26 09:44:50 +02:00
Jan Steemann c3a2886148 fixed some minor issues in arangob 2013-09-24 10:45:01 +02:00
Jan Steemann d6439f7bf1 properly set error code 2013-09-23 23:15:04 +02:00
Jan Steemann c6c4c70333 activated arangodump and arangorestore 2013-09-06 00:54:58 +02:00
Jan Steemann a53c1e493b multiple database, becoming standard 2013-09-02 09:52:52 +02:00
Jan Steemann 2c4ad55db1 don't call getenv in loop 2013-08-29 22:08:10 +02:00
Jan Steemann 2556b0714f fixed issues reported by VS 2012 2013-08-29 16:43:56 +02:00
Jan Steemann e72c6ab20c fixed a memleak in /_api/replication/dump 2013-08-29 11:46:33 +02:00
Jan Steemann 860ed964c3 simplify build.h 2013-08-28 22:20:06 +02:00
Jan Steemann 7cb6b7d922 simplified build.h stuff 2013-08-28 19:57:07 +02:00
Jan Steemann edc71e5424 support for deflate compression 2013-08-28 11:44:49 +02:00
Jan Steemann 05a7f79941 re-configuration of logger, cap constraint 2013-07-31 14:39:33 +02:00
Jan Steemann 097e8ad865 cppcheck 2013-07-28 10:47:44 +02:00
Jan Steemann f193015b5f fixed assertion 2013-07-23 10:01:20 +02:00
Jan Steemann c4f82088dd replication tests 2013-07-22 18:12:56 +02:00
Jan Steemann cf05339813 forgot to commit 2013-07-19 11:04:17 +02:00
Jan Steemann 2552d3f389 fixed compiler warnings 2013-07-19 10:54:52 +02:00
Jan Steemann 59682528e0 fixed comment 2013-07-11 17:51:15 +02:00
Jan Steemann 80362ec82f fixed issues reported by cppcheck 2013-07-11 10:02:27 +02:00
Jan Steemann ca6b184286 added TRI_JSON_STRING_REFERENCE 2013-07-10 17:00:29 +02:00
Jan Steemann 054ed3ca3f apply collection data dumps 2013-07-05 11:41:37 +02:00
Jan Steemann b178d095c2 static functions for JSON handling 2013-07-04 15:51:31 +02:00
Jan Steemann 0a98279259 replaced LOGGER_ with LOG_ (better control over memory allocation) 2013-06-28 19:04:32 +02:00
Jan Steemann ca9187854a added (unconditional) caching for PathHandler 2013-06-20 14:36:39 +02:00
Jan Steemann d31573a8b4 fixed a few type issues, updated TODOs 2013-06-07 11:31:42 +02:00
Jan Steemann d7b64d4ae2 merged patches by @guidoreina 2013-05-21 11:33:43 +02:00
Guido Reina 3c352b9ab2 The comment for the method reserve() was wrong (it was copied from the method annihilate()). 2013-05-01 11:01:35 +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 ab38a0543a fixed missing length 2013-04-05 14:47:45 +02:00