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

361 Commits

Author SHA1 Message Date
Frank Celler 494bdca847 splitted HttpRequest into GeneralRequest/HttpRequest 2016-03-31 11:45:21 +02:00
Jan Steemann b393c3d9bb Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-09 09:42:10 +01:00
Frank Celler dfa9047484 switch arangosh to new ApplicationFeatures and ProgramOptions 2016-03-08 23:32:43 +01:00
Jan Steemann eb82d96836 constexpr 2016-03-04 12:33:59 +01:00
jsteemann b3a20e915f simplified some logging 2016-02-24 22:48:56 +01:00
Wilfried Goesgens acc17daa96 Merge branch 'devel-solaris' of https://github.com/doublerebel/arangodb into doublerebel-devel-solaris 
Fix Conflicts:
	arangod/FulltextIndex/fulltext-index.cpp
	lib/Basics/logging.cpp
 2016-02-04 15:11:34 +01:00
Jan Steemann b7abf5a40d attempt to fix Windows build 2016-02-01 12:04:28 +01:00
jsteemann ae25d2b53b removed `using namespace std` 2016-01-31 18:22:00 +01:00
jsteemann 9482ee1cca use Logger 2016-01-30 00:08:35 +01:00
Jan Steemann 9046e1831b clang-format 2016-01-27 13:43:46 +01:00
Jan Steemann 3fc862f0ef changed locking macros 2016-01-26 15:39:12 +01:00
Charles Phillips a7c25d95f3 MSG_NOSIGNAL not supported on solaris platform 2016-01-25 23:29:05 -08:00
jsteemann 431900f17a changed namespace from triagens to arangodb 2016-01-17 00:44:53 +01:00
Jan Steemann 687d6133f0 comments reformatting 2016-01-11 09:52:39 +01:00
jsteemann 9f0576c65f don't rely so much on namespace std being present 2016-01-08 01:05:06 +01:00
jsteemann 50c0e18d53 removed useless con|destructor comments 2016-01-07 21:19:53 +01:00
Jan Steemann 3ad20c0cae auto-generated headers 2016-01-06 18:41:51 +01:00
Jan Steemann a3b026d9d1 removed useless sections from code, unified include guards 2016-01-06 14:15:22 +01:00
Jan Steemann f422576ee0 clang-format 2016-01-05 17:43:24 +01:00
Jan Steemann 2b3f3f997b Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2015-12-17 10:59:30 +01:00
Jan Steemann 6ee9a6f90e replication fixes 2015-12-16 19:52:01 +01:00
Jan Steemann a694b7ef48 make_unique 2015-12-16 11:36:35 +01:00
Jan Steemann 223c44d572 Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2015-12-15 12:02:47 +01:00
Jan Steemann 2b83e134f9 explicitly set closed flag 2015-12-15 11:58:32 +01:00
Michael Hackstein 5e39b1e811 Added a convenience function for default http result body parsing options 2015-12-09 21:46:13 +01:00
Michael Hackstein de588621bc Added a bodyToVelocyPack function for Simple Http Result 2015-12-09 21:10:15 +01:00
Jan Steemann 5c033f566b Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2015-12-04 13:47:08 +01:00
Jan Steemann cf7fa63a53 issue #1036: allow aborting waiting HTTP requests from the ArangoShell 2015-12-03 18:55:51 +01:00
Jan Steemann eb8899d9ae applied changes suggested by cppcheck 2015-12-02 10:17:14 +01:00
Jan Steemann 0dd207f9f5 Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2015-12-01 11:14:12 +01:00
jsteemann 04e81ea851 more replication 2015-11-30 23:33:59 +01:00
Jan Steemann f013c809ea replication improvements 2015-11-30 18:27:31 +01:00
Jan Steemann b13284a0c3 replication improvements 2015-11-27 16:16:31 +01:00
Jan Steemann 9ef5b4746a removed several includes from Common.h 2015-11-25 12:21:55 +01:00
Jan Steemann c3f52d536e really fix compilation on Windows 2015-10-01 17:38:27 +02:00
Jan Steemann d916d2f577 try to fix compile error 2015-10-01 17:36:04 +02:00
Frank Celler 1e7d970a8d create timeout before the actual call 2015-10-01 12:00:00 +02:00
Jan Steemann 5bf02f9eb9 removed assert, because a clang 2015-09-07 11:31:19 +02:00
Jan Steemann 9228fd0e89 added assertions 2015-09-07 11:07:54 +02:00
CoDEmanX b4593a7e82 Change spelling of 'initialize' to American English (comments and log messages only) 2015-09-01 17:07:21 +02:00
Jan Steemann a3ee707f6f less creations of empty headers maps 2015-08-30 22:11:18 +02:00
Jan Steemann a9d63a0612 do not advertise support for delate encoding in `org/arangodb/request` by default 2015-08-29 02:46:01 +02:00
Jan Steemann abea80ac53 issue #1436: deflate responses encoded with `content-encoding: deflate`, too 2015-08-27 15:16:32 +02:00
Jan Steemann 9f0384284f moved files 2015-08-19 11:19:37 +02:00
Jan Steemann 57e9b55739 use TRI_CHAR_NODE_PAIR() 2015-08-14 00:54:59 +02:00
Jan Steemann 68d58248da allow non-const access to string-buffer 2015-08-07 13:29:38 +02:00
Jan Steemann 9778bc16fd fix Visual Studio compile errors 2015-08-07 11:07:56 +02:00
Jan Steemann 330fac6225 some unused function cleanup 2015-08-06 21:25:32 +02:00
Jan Steemann 472a0c76b1 do not read over the end of Buffer objects 2015-08-04 19:02:14 +02:00
Jan Steemann 35529ffd61 make more environment data available in --version 2015-08-04 11:21:50 +02:00
Jan Steemann 8b8d92a18c rearrange lock structs 2015-07-31 20:02:06 +02:00
Jan Steemann ec3ccd31ba split lock 2015-07-31 16:44:42 +02:00
Max Neunhoeffer eb011a0438 Use poll rather than epoll on Linux. 2015-07-31 15:11:32 +02:00
Jan Steemann 8fbf3894cd renamed 2015-07-31 14:56:52 +02:00
Jan Steemann 91e2497bcb use unordered_map 2015-07-30 20:45:35 +02:00
Jan Steemann f7ed62b04c hold locks for shorter periods in ConnectionManager 2015-07-30 20:03:23 +02:00
Jan Steemann 7f96c01d7b pacify Valgrind 2015-07-30 20:03:08 +02:00
Max Neunhoeffer 24eb98ed49 Fix select-related bug for cluster if file descriptors become to large. 
Solution: Use epoll on Linux in SimpleHttpClient.
 2015-07-30 15:21:56 +02:00
Jan Steemann 58d5da206d validate file descriptors against FD_SETSIZE 2015-07-30 13:59:57 +02:00
Jan Steemann 58a8f2a6a2 remove v8 dependency for arangoimp 2015-06-18 18:30:45 +02:00
Willi Goesgens 53a37ae387 Fix timeouts - followup of #cc427f9b1c0e28fec5abc312df606229195db7b8 
- use TRI_microtime() instead of copying it with the name 'now()'
  - handle select-timeouts on non linux platforms.
 2015-05-26 15:55:36 +02:00
Max Kellermann c9075aeacf lib/SimpleHttpClient: don't reset timeout after EINTR 
select() modifies the given timeout variable.  Calling select() again
will run with the remaining timeout.  However, method prepare()
overwrote the reduced timeout in each iteration.
 2015-05-26 15:03:11 +02:00
Jan Steemann 882f233fd8 constify 2015-05-21 09:56:37 +02:00
Jan Steemann 771f2db94b cleanup 2015-05-11 17:26:42 +02:00
Jan Steemann bb3f208a9b use block scope 2015-05-08 18:02:45 +02:00
Willi Goesgens 9018757846 If an HTTP-Requests fails, put the error message into the status object, so we can see more reasons in cluster errors. 2015-05-04 17:20:39 +02:00
Jan Steemann 32b547886b fixed up some headers 2015-04-24 13:11:29 +02:00
Frank Celler ffbc45d2e2 new HttpServer & HttpCommTask 
Conflicts:
	Makefile.in
	arangod/Aql/RestAqlHandler.cpp
	arangod/Aql/grammar.cpp
	arangod/Cluster/RestShardHandler.cpp
	lib/GeneralServer/GeneralServer.h
	lib/GeneralServer/GeneralServerDispatcher.h
	lib/HttpServer/HttpServerJob.h
	lib/HttpServer/HttpsCommTask.h
	lib/SimpleHttpClient/SslClientConnection.cpp
 2015-03-31 09:12:01 +02:00
Willi Goesgens 713a3fc657 Follow compile of openssl V 1.0.2: SSLV3 is deprecated. 2015-02-25 17:16:44 +01:00
Jan Steemann 0327608582 moved variable declaration 2015-02-17 17:55:15 +01:00
Jan Steemann 5da33a41d5 fixed memleak 2015-02-17 17:41:40 +01:00
Willi Goesgens b3684891d3 More work on getting smart error messages. 2015-02-02 17:55:13 +01:00
Willi Goesgens 85e5bc22d9 Propper error messages for windows and posix. 2015-01-30 14:38:32 +01:00
Willi Goesgens 73023291e9 Add SSL error handling inspired by curl; make shure the user gets the message. 2015-01-29 09:52:08 +01:00
Max Neunhoeffer e7d94bf81d Put a loop around select() to take care of EINTR. 2014-12-03 23:45:20 +01:00
Max Neunhoeffer 6e2aed2732 Take out cout debugging output. 2014-12-03 23:37:16 +01:00
Max Neunhoeffer 0fb6ef1968 Fix SimpleHttpClient for the n+1 time. 
Still with debugging output.
 2014-12-03 23:31:20 +01:00
Max Neunhoeffer 8182539b66 Introduce invariants in processHeader. 2014-12-03 16:46:18 +01:00
Max Neunhoeffer 7fd0260add Yet more printouts. 2014-12-03 13:30:43 +01:00
Max Neunhoeffer f5e5617155 One more cout. 2014-12-03 11:47:22 +01:00
Max Neunhoeffer 4b099281aa Take some couts out to reproduce bug. 2014-12-03 11:17:23 +01:00
Max Neunhoeffer d938a77531 Take out some couts to reproduce error. 2014-12-03 10:47:26 +01:00
Max Neunhoeffer 776ce77452 Fix a segfault in my couts. 2014-12-03 10:20:54 +01:00
Max Neunhoeffer 41785104d5 Even more couts. 2014-12-03 09:47:20 +01:00
Max Neunhoeffer 658256059f Yet more couts. 2014-12-03 09:44:22 +01:00
Max Neunhoeffer 41b01b78bc Even more couts. 2014-12-03 09:29:02 +01:00
Max Neunhoeffer 4125ffc5b1 Add some couts to finally debug SimpleHttpClient and shell-fm test. 2014-12-03 09:11:10 +01:00
Max Neunhoeffer dbf1f66841 Fix SimpleHttpClient for the n+1 time. Some major cleanup done. 
Added a lot of comments to explain why it should work now properly.
 2014-11-16 19:56:58 -05:00
Frank Celler ff199b60eb fixed server gone reconnet 2014-11-16 20:58:02 +01:00
Frank Celler cefba69ab5 fixed chunked again 2014-11-15 17:52:10 +01:00
Frank Celler 5a783df66f removed while loop 2014-11-15 17:19:26 +01:00
Frank Celler 77fd12b987 fixed SimpleHttpClient 2014-11-14 23:50:00 +01:00
Jan Steemann beafbe6a5c fixed invalid reads 2014-11-07 11:57:26 +01:00
Jan Steemann ccd20d7638 do not print broken error message 2014-10-28 01:02:24 +01:00
Jan Steemann 13d240384f less namespace pollution 2014-10-28 00:24:37 +01:00
Jan Steemann 40e62e95a5 fixed out-of-scheduler-threads issue 2014-10-20 18:27:50 +02:00
Jan Steemann e28ad821b0 fixed spuriously occurring "database not found" error 2014-10-02 15:34:38 +02:00
Jan Steemann f3186fa065 cppcheck 2014-09-29 17:02:40 +02:00
Jan Steemann c8fba4c9be fixes for Visual Studio 2014-09-24 15:41:26 +02:00
Jan Steemann 1c134bd8a7 fixed off by one errors 2014-09-24 15:15:06 +02:00
Jan Steemann dbf964e204 small optimizations 2014-09-24 12:09:13 +02:00
Jan Steemann 506936dcdb rename orgy 2014-09-13 02:35:13 +02:00
Jan Steemann 669cb3b235 renamed files 2014-09-13 01:44:01 +02:00
Jan Steemann 42ba273589 prevent assertion failure 2014-07-02 18:52:29 +02:00
Jan Steemann 98a0ef0ded prevent endless connection attempts by arangosh 2014-07-02 15:18:24 +02:00
Jan Steemann 40473b58b7 safety 2014-07-02 12:19:28 +02:00
Jan Steemann 1b92282b32 less string buffer moves 2014-06-27 23:58:19 +02:00
Jan Steemann 76de1ae762 cppcheck 2014-06-27 22:20:17 +02:00
Frank Celler 6936972d08 updated disclaimer 2014-06-20 16:41:35 +02:00
Jan Steemann b3d18d0deb cppcheck 2014-06-16 09:50:38 +02:00
Jan Steemann 51cb9257e5 speed up string-buffer reusage by simplehttpclient 2014-06-14 01:24:43 +02:00
Jan Steemann 89f6070e01 cppcheck 2014-06-11 17:53:44 +02:00
Jan Steemann 362838ae69 TRI_ASSERT 2014-06-06 11:25:19 +02:00
Jan Steemann 7b521a4c9e Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	arangod/VocBase/document-collection.cpp
	arangod/VocBase/document-collection.h
 2014-05-30 12:51:20 +02:00
Jan Steemann 4f3ed048e4 fixed disconnect of agency connections, use less CPU while spinning in agency methods 2014-05-28 13:44:35 +02:00
Max Neunhoeffer e7560357d2 Further cleanup with #include "Basics/Common.h" 2014-05-21 16:59:54 +02:00
Max Neunhoeffer ff1dfdd55f Header cleanup: use #include "Basics/Common.h" in all C++ files. 2014-05-21 15:50:30 +02:00
Max Neunhoeffer 0af211c1e5 More header cleanups. 2014-05-21 13:42:41 +02:00
Jan Steemann 1e99992a4e added note about non-functional `options` attribute 2014-05-13 12:58:24 +02:00
Jan Steemann 2eca70e606 fixed timeout overflows on 32 bit 2014-05-09 12:17:57 +02:00
Max Neunhoeffer df68f47338 Use StringBuffer in SimpleHttpResult rather than stringstream. 2014-05-07 16:35:40 +02:00
Jan Steemann 30f9dba42f don't log nonsense errors 2014-04-03 23:23:08 +02:00
Jan Steemann 88c3089b36 don't report bogus error messages 2014-04-02 17:51:25 +02:00
Jan Steemann 1f86d43ec3 bumped version number in `X-Arango-Version` compatibility header sent by arangosh and other client tools 2014-03-14 12:16:32 +01:00
Jan Steemann 6b42df078b sockets fix 2014-03-06 17:17:31 +01:00
Max Neunhoeffer f3abfaa1b1 Fix a deadlock situation in the SimpleHttpClient if the server dies. 2014-02-21 15:14:43 +01:00
Max Neunhoeffer dd3546ee40 Resolve socket bug under Windows. 2014-02-17 14:21:47 +01:00
Max Neunhoeffer 076bc6e723 Cleanup socket abstraction for different OSes. 2014-02-14 14:44:27 +01:00
Max Neunhoeffer ca2c4cdf52 Exorcise closing of connections in SimpleHttpClient. 2014-01-30 20:46:26 +01:00
Jan Steemann e906f68235 windows fixes 2014-01-27 17:46:15 +01:00
Max Neunhoeffer ea3d3c0baa Add ConnectionManager. 2014-01-14 16:23:05 +01:00
Max Neunhoeffer f7a9acf592 Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-01-14 15:05:41 +01:00
Max Neunhoeffer fc96df2244 Separate out ConnectionManager from ClusterComm. 2014-01-14 15:04:55 +01:00
Jan Steemann b1c4f75e50 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding 2014-01-14 13:29:07 +01:00
Jan Steemann 2cc44ba58e upgraded client version number 2014-01-14 13:27:35 +01:00
Max Neunhoeffer f50452259e Allow SimpleHttpClient to keep the connection open on destruction. 2014-01-14 12:52:03 +01:00
Max Neunhoeffer f7f8543fea Revert "Add stealConnection to SimpleHttpClient." 
This reverts commit 3cf68a58526925d09556eaba2a3f4386563ffb31.
 2014-01-14 12:44:21 +01:00
Max Neunhoeffer ebdc06c8b2 Revert "Fix bug in stealConnection." 
This reverts commit f6fbcfcff07ebfe21364809d347fdc786689d57e.
 2014-01-14 12:44:19 +01:00
Max Neunhoeffer 2e3f2132c3 Revert "One more change to SimpleHttpClient." 
This reverts commit b8662d870e924de6d9a1ec0293937976b30701b2.
 2014-01-14 12:44:12 +01:00
Max Neunhoeffer 2021240bc6 One more change to SimpleHttpClient. 2014-01-14 12:42:45 +01:00
Max Neunhoeffer 06999a5d25 Fix bug in stealConnection. 2014-01-14 09:44:27 +01:00
Max Neunhoeffer 4a66d69ad5 Add stealConnection to SimpleHttpClient. 2014-01-14 09:42:50 +01:00
Jan Steemann 16e16f705c some bugfixes for asyncRequest etc 2013-12-20 18:03:55 +01:00
Jan Steemann 8bc1692d54 fixed issue #711, #687 2013-12-20 15:13:23 +01:00
Jan Steemann 7c4944de83 added --server.ssl-protocol option for client tools 
Conflicts:
	arangosh/Benchmark/BenchmarkThread.h
	lib/GeneralServer/SslAsyncCommTask.h
 2013-12-13 17:58:24 +01:00
Jan Steemann 4f50b98c45 removed second logger implementation 2013-10-30 00:38:25 +01:00
Jan Steemann 43b4f78b62 issue #620 2013-10-28 19:38:19 +01: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 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 369433f1e2 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 
Conflicts:
	arangosh/Benchmark/BenchmarkThread.h
	lib/SimpleHttpClient/SimpleHttpClient.cpp
 2013-09-05 12:34:45 +02:00
Jan Steemann 073745a5fe added --keep-alive option for arangob, improved output of arangob 2013-09-04 23:56:13 +02:00
Jan Steemann 42b8dfca49 added --server.database option for client tools 2013-09-02 13:02:53 +02:00
Jan Steemann 2556b0714f fixed issues reported by VS 2012 2013-08-29 16:43:56 +02:00
Jan Steemann edc71e5424 support for deflate compression 2013-08-28 11:44:49 +02:00
Jan Steemann 9b8b030a8a added several tests for authentication 2013-08-22 11:18:11 +02:00
Jan Steemann 08b9f57166 stoppable replication applier 2013-07-17 10:58:10 +02:00
Jan Steemann f5968a4646 handle a master's state response 2013-07-04 10:13:09 +02:00
Jan Steemann 7543ad0283 removed redundant declaration of HTTP status codes 2013-07-01 12:11:02 +02:00
Jan Steemann d7b64d4ae2 merged patches by @guidoreina 2013-05-21 11:33:43 +02:00
Jan Steemann b0bd55adbe fixed downloads 2013-04-18 12:00:49 +02:00
Jan Steemann ed4fa9361b fixed senseless wait for body in http head 2013-03-26 15:36:40 +01:00
Jan Steemann 37f364e70e added internal.download() 2013-03-24 01:04:26 +01:00
Frank Celler 1aa5109fa3 updated disclaimer 2013-03-13 17:03:18 +01: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
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 2553b572ab fixed mode 2013-02-21 14:14:20 +01:00
Oreste Panaia 2c12f63d7f libev interface 2013-02-19 20:58:21 +08:00
Frank Celler 069dcdfc94 changed logging of fatal errors 2013-02-14 16:47:35 +01:00
Jan Steemann 6c64dbd105 some more cleanup 2013-02-01 15:29:37 +01:00
Jan Steemann 0686cfdbd0 fixed error messages in simplehttpclient 2013-01-15 18:33:07 +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
Oreste Panaia cdb9055cf4 shell and import 2013-01-14 20:23:56 +08:00
Oreste Panaia c01a5c6275 arango shell and import 2013-01-14 20:16:09 +08:00
Jan Steemann 8d4fb1d8ff tried to fix connection states 2013-01-12 03:15:11 +01:00
Jan Steemann b57f1bb63f mark connection as failed in case too big chunk was read 2013-01-12 02:59:16 +01:00
Jan Steemann 6ccd27a37f fixed randomly hanging connections in arangosh on MacOS. 2013-01-10 18:12:21 +01:00
Jan Steemann 41eb634cd2 potential fix for hanging connections in arangosh 2013-01-10 11:00:39 +01:00
Jan Steemann 8e2cf1e4b3 reset reconnect counter 2013-01-09 23:00:47 +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
Oreste Panaia 857b66c490 windows version 2012-12-06 20:44:01 +08:00
Jan Steemann f63d47c028 fixed request timeouts, increased max packet size for arangosh 2012-10-12 01:26:03 +02:00
Jan Steemann 97723bbdf6 removed --enable-ssl configure option 
having OpenSSL installed is now a requirement for compiling ArangoDB
 2012-10-10 14:55:18 +02:00
Oreste Panaia 0e835b90b2 windows 2012-10-08 23:29:29 +08:00
Oreste Panaia aac17f7b55 wrapper for memory mapped files add 2012-10-05 18:31:13 +08:00
Jan Steemann 68ee67afd8 fixed SSL endless wait when data sent was bigger than readBuffer 2012-09-27 13:46:14 +02:00
Jan Steemann 0619c9960c fixed arangob for batch requests 2012-09-25 11:46:15 +02:00
Jan Steemann f08a788f7c removed protocol buffers 2012-09-24 13:44:30 +02:00
Jan Steemann 61d49924be more binary handling 2012-09-20 13:11:33 +02:00
Jan Steemann 879573944c bugfixes, accept longer binary messages 2012-09-20 11:33:14 +02:00
Jan Steemann cd7178f9c5 fixed serialisation/deserialisation of length 2012-09-19 19:12:36 +02:00
Jan Steemann 29778d0b4d added binary client 2012-09-19 18:03:43 +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 80373334b3 removed dependency on JsonParserX and Variant*, fixed a small memleak 2012-09-06 16:44:25 +02:00
Jan Steemann d602942925 preparation for issue #110: added HTTP patch method 2012-08-20 13:50:24 +02:00