1
0
Fork 0
Commit Graph

1297 Commits

Author SHA1 Message Date
Max Neunhoeffer 0b2ff098f3 Start to use shared_ptr from boost. 2014-01-22 16:20:34 +01:00
Max Neunhoeffer 2d44e85f6d Add hashing of TRI_json_t to uint64_t. 2014-01-22 16:20:05 +01:00
Jan Steemann 80e8250d54 fixed segfault 2014-01-21 12:50:35 +01:00
Jan Steemann 64417d4423 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding
Conflicts:
	arangod/V8Server/v8-vocbase.cpp
2014-01-21 09:29:45 +01:00
Jan Steemann a2e11e606b added graph-specific error code 2014-01-18 01:08:24 +01:00
Jan Steemann c7457ff8f5 updated documentation 2014-01-17 17:10:53 +01:00
Max Neunhoeffer 6b4bbe5d04 Fix a description of two methods. 2014-01-17 10:59:23 +01:00
Max Neunhoeffer 92e52c33f8 Add a note about a possible bug. 2014-01-17 09:06:35 +01:00
Jan Steemann 8ef247eae5 fixed compile warning 2014-01-16 15:05:08 +01:00
Jan Steemann bfbf7de9d3 fixed compile warning 2014-01-16 15:04:42 +01:00
Jan Steemann c9dabaca86 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding 2014-01-16 15:02:44 +01:00
Max Neunhoeffer 5b4a0bf3c2 Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-01-16 15:01:53 +01:00
Max Neunhoeffer 5960c103bc Create/drop Database/Collection compiles. 2014-01-16 15:01:36 +01:00
Jan Steemann 4a731a0c9e removed unused file 2014-01-16 14:53:35 +01:00
Jan Steemann 481cd2d1be added collection._dbName 2014-01-16 11:10:37 +01:00
Frank Celler f56ac27dc9 Merge remote-tracking branch 'origin/1.4' into devel
Conflicts:
	CHANGELOG
	CMakeLists.txt
	GNUmakefile
	Makefile.in
	VERSION
	arangod/V8Server/ApplicationV8.cpp
	build.h
	configure
	configure.ac
	js/actions/api-foxx.js
	js/apps/system/aardvark/api-docs.json
	js/apps/system/aardvark/api-docs/batch.json
	js/apps/system/aardvark/api-docs/collection.json
	js/apps/system/aardvark/api-docs/cursor.json
	js/apps/system/aardvark/api-docs/database.json
	js/apps/system/aardvark/api-docs/document.json
	js/apps/system/aardvark/api-docs/edge.json
	js/apps/system/aardvark/api-docs/edges.json
	js/apps/system/aardvark/api-docs/endpoint.json
	js/apps/system/aardvark/api-docs/graph.json
	js/apps/system/aardvark/api-docs/index.json
	js/apps/system/aardvark/api-docs/job.json
	js/apps/system/aardvark/api-docs/replication.json
	js/apps/system/aardvark/api-docs/simple.json
	js/apps/system/aardvark/api-docs/system.json
	js/apps/system/aardvark/api-docs/traversal.json
	lib/BasicsC/locks-win32.c
2014-01-16 08:53:31 +01:00
Frank Celler c890caf260 fixed typos in windows parts 2014-01-16 08:40:36 +01:00
Jan Steemann 69a6e6449e fixed Doxygen errors 2014-01-15 18:06:07 +01:00
Frank Celler c0bf43d641 added ARANGODB_CONFIG_PATH 2014-01-15 14:27:01 +01:00
Jan Steemann 4a805062bb changed internal APIs 2014-01-15 13:36:38 +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 9c63246d1c added TRI_SHARDING_COLLECTION_NOT_IMPLEMENTED macro 2014-01-14 14:04:29 +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
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 5b965b2a21 added initialised() method 2014-01-07 17:50:52 +01:00
Jan Steemann bb7f550f7a for Michael... 2014-01-07 16:46:18 +01:00
Jan Steemann 9ce78430ac create collections, v0.0.0 2014-01-07 16:28:12 +01:00
Max Neunhoeffer 11e018e6b2 Make global ArangoClusterComm object in each thread. 2014-01-07 11:50:05 +01:00
Max Neunhoeffer bbf28e3501 Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding
Conflicts:
	arangod/Cluster/v8-cluster.cpp
2014-01-07 11:45:43 +01:00
Jan Steemann 3183e6d402 created global cluster object variables 2014-01-07 11:34:42 +01:00
Jan Steemann 3309743c1a moved some collection parameters around 2014-01-07 11:02:49 +01:00
Max Neunhoeffer 33d063d6d6 Start to move ClusterComm to JavaScript. 2014-01-06 16:18:24 +01:00
Jan Steemann 5571698555 serialize/unserialize collection data from agency 2014-01-03 19:04:50 +01:00
Max Neunhoeffer eb2afb2f04 Implement case distinction for create collection between cluster and not. 2014-01-03 16:17:34 +01:00
Max Neunhoeffer 6c36c268f0 Improve debugging output of ClusterComm asynchronous requests. 2014-01-03 09:36:37 +01:00
Jan Steemann d1bee4cf58 added functions to query the server state 2014-01-02 15:13:44 +01:00
Frank Celler 8dbdf55165 Merge remote-tracking branch 'origin/1.4' into devel
Conflicts:
	CHANGELOG
	arangosh/ArangoShell/ArangoClient.cpp
2013-12-30 17:27:17 +01:00
Frank Celler 9928cd645f added local config 2013-12-30 17:20:39 +01:00
Max Neunhoeffer 5d51d7b3ba Get rid of many debugging messages. 2013-12-30 14:49:14 +01:00
Max Neunhoeffer 3415e3c0c8 Some cleanup in asyncRequest setup. 2013-12-30 10:22:21 +01:00