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

2812 Commits

Author SHA1 Message Date
Jan Steemann 50f2ffaaaf fixed misbehaving memory barriers for Visual Studio 2013 
seems we are affected by the issue described here:
http://lists.schmorp.de/pipermail/libev/2014q1/002318.html
 2014-04-02 14:19:40 +02:00
Max Neunhoeffer 4ed8230b3a Merge branch 'devel' into associative_tests 2014-03-31 08:46:36 +02:00
Jan Steemann 55f0dc5739 logfile opening/closing fixes 2014-03-28 16:45:06 +01:00
Max Neunhoeffer f7476a36ef Take out some diagnostics. 2014-03-28 16:25:13 +01:00
Max Neunhoeffer 7f11440402 Repair graphs with new edge index. 2014-03-28 16:21:18 +01:00
Max Neunhoeffer 078687fe00 Change edge index. Compiles but does not work yet. 2014-03-28 11:10:49 +01:00
Max Neunhoeffer 05c9e4fd54 Cleanup resizing of MultiPointerHash 2014-03-28 09:14:20 +01:00
Max Neunhoeffer 3dc507d0ed Fix after merge from devel. 2014-03-27 16:37:10 +01:00
Max Neunhoeffer b4e80d5a26 Merge branch 'devel' into associative_tests 2014-03-27 16:32:56 +01:00
Max Neunhoeffer 650d852db9 Graph tests work again. 2014-03-27 16:32:24 +01:00
Jan Steemann e2f1d0dfb6 fixed issues in arango-dfdb 2014-03-27 12:29:32 +01:00
Jan Steemann c789c16b82 compilers shouldn't complain about that 2014-03-27 09:43:01 +01:00
Jan Steemann cf0ea1b615 fixed deallocation of edges 2014-03-27 09:27:13 +01:00
Jan Steemann 4ddaa74f74 logfile manager 2014-03-26 17:16:49 +01:00
Max Neunhoeffer 7b4f7f665c Lookup compiles, deletion planned. 2014-03-26 16:21:50 +01:00
Jan Steemann 25f81195a9 logfile manager 2014-03-26 16:00:24 +01:00
Max Neunhoeffer c32f717a07 Merge branch 'devel' into associative_tests 2014-03-26 15:12:54 +01:00
Max Neunhoeffer 185d86c04f Snapshot before moving to indices in associative-multi. 2014-03-26 15:12:36 +01:00
Jan Steemann 92f87c1421 updated logfile manager 2014-03-25 18:21:31 +01:00
Max Neunhoeffer fd76cd6fad Experiments on hashing. 2014-03-25 16:24:27 +01:00
Frank Celler d34832bbcf added changePassword attribute for users 2014-03-25 11:40:13 +01:00
Jan Steemann cc533c5df5 fixed segfault 2014-03-25 11:16:51 +01:00
Jan Steemann f758690ddc fixed memleak 2014-03-25 10:50:38 +01:00
Jan Steemann d0189d1f9b remove unnecessary syscall 2014-03-25 00:47:43 +01:00
Jan Steemann fa391e0636 slight GC improvements 2014-03-24 16:12:59 +01:00
Max Neunhoeffer c17daf2ab9 Take out timing debugging output. 2014-03-24 14:21:34 +01:00
Max Neunhoeffer dde446fb28 Optimise hash tables by no longer using % for wraparound. 2014-03-24 14:04:24 +01:00
Jan Steemann 2aef412cd4 use sizeHint for hash index, too 2014-03-21 22:59:41 +01:00
Jan Steemann 3bbe709397 compiler rant 2014-03-21 19:54:33 +01:00
Jan Steemann e8b91ccf85 remove logfiles 2014-03-21 18:27:14 +01:00
Jan Steemann 8da51546c8 little refactoring 2014-03-21 14:53:42 +01:00
Jan Steemann b6adfe26ab fix compile warning 2014-03-20 20:20:48 +01:00
Jan Steemann 272f7c6850 wal, fully non-functional, not used 2014-03-20 17:56:39 +01:00
Jan Steemann 87a2a5beb1 fix Windows compile error 2014-03-19 10:43:42 +01:00
Jan Steemann 29b7250b40 initial addition for WAL 2014-03-18 17:13:11 +01:00
Jan Steemann feca0cff53 added status method 2014-03-18 10:49:49 +01:00
Jan Steemann 1651776719 transactions 2014-03-17 15:28:16 +01:00
Jan Steemann c760272a7f provide a sint hint to indexes when initially filling them 
this may speed up building indexes when opening an existing collection
 2014-03-17 11:29:13 +01:00
Jan Steemann b5b00ebdb0 set vocbase state for "artificial" databases 2014-03-17 09:00:15 +01:00
Max Neunhoeffer 698ce99b7c Revert "Add some debugging output for McHacki." 
This reverts commit 480735e0722c4df0c5795b082cd882f833bcf491.
 2014-03-14 23:09:22 +01:00
Max Neunhoeffer 931fb631b2 Revert "Correct debugging output for McHacki." 
This reverts commit fa680febc42ef0870c5af4d329180995a10b835a.
 2014-03-14 23:09:20 +01:00
Max Neunhoeffer c5595799a7 Revert "Even more debug output." 
This reverts commit fdc834b07f083311377a33741e6af57507fcd5fc.
 2014-03-14 23:09:18 +01:00
Max Neunhoeffer f4e733bc75 Revert "Yet again more debugging output." 
This reverts commit 7ecec48675c7f905024f239156d8124d27f1974f.
 2014-03-14 23:09:08 +01:00
Jan Steemann bbc1f1a0d5 removed unused function 2014-03-14 16:39:52 +01:00
Jan Steemann a0da7e483d added diagnostic message at startup 2014-03-14 13:32:49 +01:00
Jan Steemann 1b69e337a6 fixed datafiles issues 2014-03-14 13:25:15 +01:00
Max Neunhoeffer bf7302f245 Yet again more debugging output. 2014-03-14 11:37:50 +01:00
Max Neunhoeffer dda787ba62 Even more debug output. 2014-03-14 11:01:24 +01:00
Max Neunhoeffer bcfcc9a983 Correct debugging output for McHacki. 2014-03-14 10:38:52 +01:00
Max Neunhoeffer c1395fbbbb Add some debugging output for McHacki. 2014-03-14 10:37:32 +01:00
Jan Steemann 19fb30db14 Revert "free barriers properly" 
This reverts commit 35a74cf20ce1fa7f801b375fe7a6a51da9536ee5.

Conflicts:
	arangod/V8Server/v8-query.cpp
 2014-03-13 23:28:11 +01:00
Jan Steemann 9b0bb25cc5 don't requeue identical global context methods 2014-03-13 21:48:27 +01:00
Jan Steemann ef45f43be9 fixed arango-dfdb issues 2014-03-13 20:56:45 +01:00
Jan Steemann 4cd329090b free barriers properly 2014-03-13 20:09:53 +01:00
Jan Steemann 40445d973e negate condition for iterate markers 2014-03-13 18:11:26 +01:00
Jan Steemann 6f3b4725f6 removed hash array statistics 2014-03-12 19:56:23 +01:00
Jan Steemann ff2198151b fixed vector insert at end 2014-03-12 14:27:51 +01:00
Jan Steemann babaf2738b adjusted tests 2014-03-12 14:19:13 +01:00
Jan Steemann 35cf13a38c more tests for shapes 2014-03-12 13:26:09 +01:00
Jan Steemann 9da8d0ddfe allow startup options `temp-path` and `default-language` to be specified from the command-line and not only from config files 2014-03-12 12:12:58 +01:00
Max Neunhoeffer 7b9e40ade6 Fix the initialiser order to please the compiler. 2014-03-11 19:49:11 +01:00
Max Neunhoeffer 7014f0bcb0 Circumvent a Visual Studio Express 2013 compiler bug. 2014-03-11 16:13:03 +01:00
Frank Celler 6ea76eeb9c new bison 3 2014-03-10 19:24:28 +01:00
Jan Steemann 7df402d1cd removed command line option `--database.remove-on-drop` 2014-03-10 17:03:17 +01:00
Jan Steemann 3c88e45802 fixed too eager compaction 
Conflicts:
	CHANGELOG
	arangod/VocBase/compactor.c
 2014-03-10 16:55:15 +01:00
Max Neunhoeffer cd0a33de9f Seemingly fix behaviour on Windows. 
Note: WSACleanup complains and we do not know a fix.
 2014-03-07 16:48:21 +01:00
Jan Steemann ec9e3f2402 debug information 2014-03-07 12:17:38 +01:00
Max Neunhoeffer 9d43383f1d Fix automatic reload of user config on coordinators. 2014-03-07 11:37:16 +01:00
Max Neunhoeffer ed46d0d3a8 Increase TTL value for heartbeat status in agency to 8. 2014-03-06 17:54:34 +01:00
Jan Steemann b3b22a1f1c changed authentication procedure 2014-03-06 16:37:00 +01:00
Jan Steemann 79defc2ef1 -Wunreachable-code reverted. Visual Studio doesn't like it 2014-03-06 11:36:58 +01:00
Jan Steemann c5c294aa6b -Wunreachable-code 2014-03-06 11:30:38 +01:00
Jan Steemann 4cbe5cf69a shutup VC warning 2014-03-06 10:34:00 +01:00
Jan Steemann e968d62367 re-use planId 2014-03-05 15:33:49 +01:00
Esteban Lombeyda e38906dd21 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 
Conflicts:
	arangod/RestHandler/RestPleaseUpgradeHandler.cpp
 2014-03-05 09:12:49 +01:00
Esteban Lombeyda 39b0b759e9 bug fix: compiling error 2014-03-05 09:00:23 +01:00
Jan Steemann 415055705f adjusted documentation 2014-03-04 18:45:56 +01:00
Jan Steemann 5ebdc7d307 fixed "cannot convert value to JSON" error 2014-03-04 16:21:40 +01:00
Max Neunhoeffer 1cb38c6aca Fix compilation under windows. 2014-03-04 08:53:16 +01:00
Jan Steemann c092158891 disable forwarding of expect header 2014-03-03 19:24:26 +01:00
Jan Steemann a4451d3459 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-03 12:03:51 +01:00
Jan Steemann f5234b0ed6 always return ignoreNull 2014-03-03 12:03:14 +01:00
Frank Celler 79a98c5095 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-03-03 11:12:14 +01:00
Frank Celler 2e80955b5f removed debug message 2014-03-03 11:12:08 +01:00
Jan Steemann 65bc5dddad documentation 2014-03-03 10:40:29 +01:00
Jan Steemann 8041752f4f documentation 2014-03-03 10:33:29 +01:00
Jan Steemann 1481ceba42 documentation 2014-03-03 10:28:38 +01:00
Jan Steemann 3478c8bc74 cppcheck 2014-03-03 09:12:34 +01:00
Frank Celler 5a2fa4f37d stop if upgrade is needed 2014-03-01 16:14:29 +01:00
Jan Steemann be8abb0cc1 allow syncing with 2.0 2014-02-28 22:19:21 +01:00
Jan Steemann 978e784462 disable replication handlers for coordinators 2014-02-28 21:51:02 +01:00
Frank Celler b888e8cfa6 Merge branch 'devel' of github.com:triAGENS/ArangoDB into sharding 
Conflicts:
	arangod/V8Server/V8PeriodicJob.cpp
	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
 2014-02-28 20:37:05 +01:00
Jan Steemann 0b1dcc0deb include collection in inventory if id is equal to current server tick 2014-02-28 20:00:04 +01:00
Max Neunhoeffer 944f29deb0 Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-02-28 18:51:24 +01:00
Max Neunhoeffer cb8f0257a7 Give the server state in the agency a time to live. 2014-02-28 18:47:46 +01:00
Jan Steemann 3ca2001c99 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-28 18:43:36 +01:00
Jan Steemann 629348d696 properly acquire shape write locks 2014-02-28 18:43:09 +01:00
Max Neunhoeffer 0a8555fab3 Sort out path to javascript files. 2014-02-28 14:19:04 +01:00
Jan Steemann 4615310e97 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-28 13:50:56 +01:00
Jan Steemann fd08bb0feb use indexes in AQL 2014-02-28 13:50:39 +01:00
Frank Celler 1aa3a02167 changed default log level to warning 2014-02-28 12:25:30 +01:00
Esteban Lombeyda 85e824f1c8 Bug Fix: compiler error 
: searching strategy for installation directory upgraded
 2014-02-28 12:07:29 +01:00
Frank Celler f22f1525d2 Merge branch 'sharding' of github.com:triAGENS/ArangoDB into sharding 
Conflicts:
	etc/relative/arangod.conf
 2014-02-28 12:03:11 +01:00
Frank Celler 9a410a5b71 added config for server state 2014-02-28 12:02:21 +01:00
Jan Steemann 6f26e4fc23 do not pass auth header 2014-02-28 09:12:27 +01:00
Jan Steemann c04377e4cd Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-28 08:59:48 +01:00
Jan Steemann ed8f52b323 fixed small memleak reported by valgrind 2014-02-27 20:40:49 +01:00
Jan Steemann 8edf96e9aa added documentation for cluster authentication options 2014-02-27 19:27:12 +01:00
Jan Steemann 897d6f4dcd fixed cluster authentication 2014-02-27 17:45:03 +01:00
Jan Steemann a0c554fa22 fixed tests 2014-02-27 14:58:01 +01:00
Jan Steemann 076b8f1029 fixed test 2014-02-27 14:03:23 +01:00
Jan Steemann c387b697e8 fixed test 2014-02-27 13:26:40 +01:00
Jan Steemann a0c32e90d7 fixed edge access in coordinator 2014-02-27 13:14:02 +01:00
Frank Celler 3afa2214f7 added disable-cluster-dispatcher 2014-02-27 11:47:26 +01:00
Frank Celler 710c3c9716 Merge branch 'sharding' of github.com:triAGENS/ArangoDB into sharding 2014-02-27 09:17:39 +01:00
Jan Steemann ef84dc23e2 fixed segfault 2014-02-27 09:16:07 +01:00
Frank Celler e10bab8059 Merge branch 'devel' of github.com:triAGENS/ArangoDB into sharding 2014-02-27 09:16:02 +01:00
Frank Celler 8406f51435 Merge remote-tracking branch 'origin/1.4' into devel 
Conflicts:
	CHANGELOG
	VERSION
	arangod/Ahuacatl/ahuacatl-access-optimiser.c
	arangod/Ahuacatl/ahuacatl-codegen.c
	build.h
	configure
	configure.ac
	js/apps/system/aardvark/api-docs.json
	js/apps/system/aardvark/api-docs/batch.json
	js/apps/system/aardvark/api-docs/database.json
	js/apps/system/aardvark/api-docs/endpoint.json
	js/apps/system/aardvark/api-docs/job.json
	js/apps/system/aardvark/api-docs/replication.json
	js/apps/system/aardvark/api-docs/system.json
	js/apps/system/aardvark/frontend/js/modules/org/arangodb/graph/traversal.js
	js/common/modules/org/arangodb/graph/traversal.js
	js/server/modules/org/arangodb/ahuacatl.js
	lib/HttpServer/HttpCommTask.h
 2014-02-27 09:13:03 +01:00
Jan Steemann f5269fa3de fixed traversals 2014-02-26 21:28:40 +01:00
Jan Steemann fe74e030ea fixed keygen test 2014-02-26 16:47:38 +01:00
Jan Steemann 08ff8f9237 allowUserKeys method 2014-02-26 16:31:48 +01:00
Jan Steemann 460455d0ed dont clear result 2014-02-26 16:31:23 +01:00
Jan Steemann 7f9ae2292c fix geo index comparison 2014-02-26 15:11:07 +01:00
Jan Steemann 4137eb72ae prevent segfault 2014-02-26 15:03:58 +01:00
Jan Steemann b086729d1b Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-26 14:23:13 +01:00
Jan Steemann 42465ce876 properly return collection status 2014-02-26 14:23:06 +01:00
Max Neunhoeffer c1ac5eeecf Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-02-26 13:58:26 +01:00
Jan Steemann 276a3cf3a1 added SHORTEST_PATH AQL function, fixed bug in Graph.pathTo 2014-02-26 13:34:42 +01:00
Max Neunhoeffer 54d62007f2 Create users in new cluster database (if given). 2014-02-26 13:28:20 +01:00
Jan Steemann 8e05df9950 split tests 2014-02-26 13:21:10 +01:00
Jan Steemann e0ec5768a5 disallow dropping certain system collections 2014-02-26 12:04:28 +01:00
Jan Steemann 0b50c0353d disallow dropping certain system collections 2014-02-26 12:01:56 +01:00
Jan Steemann 9ac1a7cc50 cluster-internal authentication 2014-02-26 12:01:41 +01:00
Jan Steemann 9a56f68468 fixed return value for remove 2014-02-26 11:07:32 +01:00
Jan Steemann 23ba186b0d Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding 
Conflicts:
	CHANGELOG
	arangod/Ahuacatl/ahuacatl-access-optimiser.c
	arangod/CapConstraint/cap-constraint.c
	js/apps/system/aardvark/frontend/scss/_tiles.scss
	js/apps/system/aardvark/frontend/scss/generated.css
	js/apps/system/aardvark/frontend/scss/style.scss
	js/common/modules/org/arangodb/users-common.js
 2014-02-25 17:21:14 +01:00
Jan Steemann 98ceb07b77 add initial user 2014-02-25 17:05:02 +01:00
Frank Celler 3c5f3a656b Merge branch 'sharding' of github.com:triAGENS/ArangoDB into sharding 2014-02-25 15:32:12 +01:00
Frank Celler f2121ff442 cleanup 2014-02-25 15:32:07 +01:00
Max Neunhoeffer 6d88ec3dde Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-02-25 14:24:41 +01:00
Max Neunhoeffer 4add2b4c9f The sin of the day: Disable transactions on coordinators. 2014-02-25 14:24:22 +01:00
Jan Steemann 00cd7cd936 fix error message for udf document keys 2014-02-25 14:23:59 +01:00
Jan Steemann 0d57a95d52 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-25 14:08:08 +01:00
Jan Steemann e1f3b6f2d4 react on empty shard lists 2014-02-25 14:08:00 +01:00
Frank Celler 569778ae10 Merge branch 'sharding' of github.com:triAGENS/ArangoDB into sharding 2014-02-25 12:07:46 +01:00
Frank Celler 42fb8244e1 added requeue 2014-02-25 12:07:16 +01:00
Max Neunhoeffer f3d12fdd35 Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-02-25 11:35:21 +01:00
Max Neunhoeffer 974cc8b441 Correct a caching bug in ClusterInfo. 2014-02-25 11:34:59 +01:00
Jan Steemann af96607fc1 fixed index tests 2014-02-25 11:19:51 +01:00
Jan Steemann 0b2c38bfac fixed uninitialised variable access 2014-02-24 17:50:19 +01:00
Jan Steemann edb0e61e13 fixed uninitialised variable access 2014-02-24 17:48:56 +01:00
Jan Steemann a907fa332c fixed wrong condition 2014-02-24 15:56:17 +01:00
Jan Steemann ea717607e1 implemented missing useDatabase for coordinator 2014-02-24 15:43:02 +01:00
Jan Steemann 4988abb3fd prevent segfault 2014-02-24 15:03:34 +01:00
Jan Steemann f8ebe5ded5 fixed small memleak 2014-02-24 14:51:06 +01:00
Jan Steemann 018a8390ce refactored create/drop database 2014-02-24 14:50:31 +01:00
Jan Steemann bb3704e04b fixed small memleak 2014-02-24 14:23:50 +01:00
Jan Steemann a6b71d8eba fixed memleak 2014-02-24 14:19:42 +01:00
Jan Steemann 00d8a9023f Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-21 17:40:38 +01:00
Jan Steemann 7a0aac82e2 re-create database objects on coordinator now, and switch into them 2014-02-21 17:40:00 +01:00
Max Neunhoeffer 267ee74d9a Fix a namespace problem with a new file. 2014-02-21 16:11:00 +01:00
Max Neunhoeffer f7e57a5b47 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into sharding 
Conflicts:
	js/apps/system/aardvark/frontend/scss/generated.css
	js/apps/system/aardvark/manifest.json
	lib/Rest/EndpointIp.cpp
	lib/Rest/EndpointUnixDomain.cpp
	lib/V8/v8-utils.cpp
 2014-02-21 15:28:21 +01:00
Jan Steemann 50b3ec2999 fixed compiler warnings 2014-02-21 14:45:15 +01:00
Max Neunhoeffer 91db141ea5 Change value of things in agency according to Sharding.md. 2014-02-21 13:19:57 +01:00
Jan Steemann 2e03f01a25 moved implementation of DBServerJob into own file 2014-02-21 09:09:21 +01:00
Jan Steemann 2f6f59e228 fixed startup race condition 2014-02-21 08:47:24 +01:00
Frank Celler 5a7880b037 added no request 2014-02-20 21:09:13 +01:00
Frank Celler c7c5576f18 Merge branch 'devel' of github.com:triAGENS/ArangoDB into sharding 2014-02-20 21:02:37 +01:00
Frank Celler b01d9d77e7 Merge branch 'devel' of github.com:triAGENS/ArangoDB into sharding 
Conflicts:
	arangod/RestServer/ArangoServer.cpp
	arangod/V8Server/ApplicationV8.cpp
	arangod/V8Server/ApplicationV8.h
	arangod/V8Server/v8-actions.cpp
	js/apps/system/aardvark/frontend/js/bootstrap/module-internal.js
	js/apps/system/aardvark/frontend/scss/generated.css
	js/server/version-check.js
	lib/Dispatcher/Job.h
	lib/GeneralServer/GeneralServerJob.h
 2014-02-20 21:02:07 +01:00
Frank Celler b427bad63a do not allow reset 2014-02-20 20:51:00 +01:00
Frank Celler 730da7623a added periodic tasks and statistics historian 2014-02-20 20:29:55 +01:00
Jan Steemann 13357cb846 made clear functions private 2014-02-20 17:33:56 +01:00
Jan Steemann 0480dbb404 added collection.revision() 2014-02-20 17:30:26 +01:00
Jan Steemann a820a74a6b added collection.figures() for sharded collections 2014-02-20 17:06:36 +01:00
Jan Steemann 9666407721 sped up property lookup for db 2014-02-20 12:52:41 +01:00
Jan Steemann ba8a1fb51f disallow key generators 2014-02-20 09:34:11 +01:00
Jan Steemann 4f48172323 some renames 2014-02-20 09:16:25 +01:00
Jan Steemann 82d84e92dd more sleeping 2014-02-19 18:33:11 +01:00
Jan Steemann d92dd90aac fixed instance race condition 2014-02-19 17:10:11 +01:00
Jan Steemann 4770fed362 removed dead code 2014-02-19 15:35:52 +01:00
Jan Steemann dd5b172e2c fixed race conditions 2014-02-19 14:55:21 +01:00
Frank Celler 726144ce39 Merge branch 'devel' of github.com:triAGENS/ArangoDB into sharding 
Conflicts:
	arangod/V8Server/ApplicationV8.cpp
 2014-02-19 14:30:46 +01:00
Frank Celler c779325b5d added frontend-development switch 2014-02-19 14:28:51 +01:00
Jan Steemann 66bc4c9a41 allow unique index creation on shard keys only 2014-02-19 10:30:41 +01:00
Jan Steemann 29f3e17eef extract real error number 2014-02-18 14:27:32 +01:00
Jan Steemann dc8e590bca inedges, outedges, edges 2014-02-18 13:46:09 +01:00
Michael Hackstein 015ab56259 Merge remote-tracking branch 'origin/devel' into sharding 
Conflicts:
	arangod/VocBase/document-collection.c
	arangosh/CMakeLists.txt
	js/apps/system/aardvark/test/karma/karma.conf.js
 2014-02-18 08:50:27 +01:00
Frank Celler 57796c96d1 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-17 16:55:17 +01:00
Frank Celler c5d6e6a9d3 fixed rethrow 2014-02-17 16:54:03 +01:00
Max Neunhoeffer 640b7c1530 Start fixing post-database creation actions for coordinator. 2014-02-17 16:31:43 +01:00
Max Neunhoeffer 99df09decb Fix cmake entry for RestShutdownHandler 2014-02-17 16:30:23 +01:00
Max Neunhoeffer fd8ed72546 Add RestShutdownHandler.cpp to CMakeLists.txt 2014-02-17 14:37:31 +01:00
Max Neunhoeffer 064aec971e Get rid of template parameters for make_pair in one place. 2014-02-17 14:11:47 +01:00
Jan Steemann c40d930fa6 issue #765: added SLICE AQL function 2014-02-17 11:09:03 +01:00
Jan Steemann 89d96c6c3b Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-14 18:47:59 +01:00
Jan Steemann ec0ad56f8e fix potentially dangerous function 2014-02-14 18:47:41 +01:00
Jan Steemann 3fd053eb1e updated tests 2014-02-14 18:44:36 +01:00
Frank Celler 65d7d8fdab Merge remote-tracking branch 'origin/devel' into sharding 2014-02-14 17:23:33 +01:00
Frank Celler ddfbe9d8f9 ignore helper files 2014-02-14 16:52:01 +01:00
Max Neunhoeffer 98ed29ab84 Make check for useDatabase switchable for unittests. 2014-02-14 15:33:35 +01:00
Esteban Lombeyda e958f6052a Icon Bug fix 2014-02-14 15:12:12 +01:00