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

9285 Commits

Author SHA1 Message Date
Jan Steemann 5a3b49a7bc fixed r/w deadlock 2013-12-20 16:27:54 +01:00
Jan Steemann c460ab97e9 applied changes from devel branch 2013-12-20 15:40:56 +01:00
Jan Steemann b903d9080d Merge remote-tracking branch 'origin/devel' into sharding 
Conflicts:
	js/apps/system/aardvark/test/karma/karma.conf.js
 2013-12-20 15:35:50 +01:00
Jan Steemann 02d22048be updated CHANGELOG 2013-12-20 15:24:56 +01:00
Jan Steemann 8bc1692d54 fixed issue #711, #687 2013-12-20 15:13:23 +01:00
Max Neunhoeffer 7f2241ae20 Rearrange locking look in sending thread. 2013-12-19 16:24:15 +01:00
Max Neunhoeffer 5c80816352 Can do one roundtrip. 
Client -REST-> Coordinator -> sendQueue -REST-> DBServer
         -> recvQueue -REST-> Client
 2013-12-19 16:15:54 +01:00
Max Neunhoeffer a79c5801d8 Fix documentation of timeout unit. 2013-12-19 12:16:30 +01:00
Max Neunhoeffer bfbbe18c57 Create a testing possibility for ClusterComm. 2013-12-19 11:33:34 +01:00
Max Neunhoeffer b55c7e22f9 Basic queueing logic ready. 
Actual sending still todo.
 2013-12-19 09:06:45 +01:00
Jan Steemann 5d5035ed3a fixed JS error 2013-12-18 16:24:03 +01:00
Michael Hackstein ec83539390 The start view of the graph viewer now offers support for multiple label/colour attributes 2013-12-18 09:36:05 +01:00
Max Neunhoeffer 32f49d3c09 Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 
Conflicts:
	arangod/Cluster/ClusterComm.cpp
 2013-12-18 08:52:10 +01:00
Michael Hackstein bf520f652f GraphViewer it is now possible to define a list of label attributes and colour attributes 2013-12-17 23:25:06 +01:00
Jan Steemann cd1ab21177 do not spam my logs please 2013-12-17 15:42:27 +01:00
Max Neunhoeffer 975f6b19fa Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2013-12-17 13:52:41 +01:00
Max Neunhoeffer fdc664859c Add skeletons of new functions. 2013-12-17 13:52:31 +01:00
Jan Steemann 8fa172f03c added callbacks for async requests 2013-12-17 13:51:07 +01:00
Max Neunhoeffer 9c4a25670e Start the background thread for ClusterComm. 2013-12-17 11:42:01 +01:00
Michael Hackstein d3be3c37b8 GraphViewer: Nodes can now be coloured by a list of attributes also. Still Missing Interface 2013-12-17 11:04:05 +01:00
Max Neunhoeffer e84a9fe3ca Finalise public interface for ClusterComm library. 2013-12-17 10:44:16 +01:00
Michael Hackstein 521314c73a The nodeshaper will now cut down long word labels. Also it is able internally use an array of label attributes. TODO: Add list to colours and offer interface for it 2013-12-17 09:57:40 +01:00
Michael Hackstein 3be384a624 Fixed all karma tests (especially JSLint in Browsers). Problem is that i had a test checking for location.replace which did fail but pointed the browser to some undefined location instead 2013-12-17 09:06:46 +01:00
Michael Hackstein 736a00449b Added some more style to the context menu. Now looks like a list of normal buttons 2013-12-16 17:31:50 +01:00
Michael Hackstein d71cdae36b Added context menu to edges. Started with styling. Needs some more love 2013-12-16 17:31:14 +01:00
Michael Hackstein 5bf4714ce0 Fixed merge conflict in karma.conf 2013-12-16 16:42:44 +01:00
Michael Hackstein 490417de31 Started with adding a context menu for nodes. Modified karma config. It now does not run JSLint and WebWorkers specific tests, they somhow fail on the jenkins server. Will be fixed again 2013-12-16 16:41:24 +01:00
Frank Celler d48b2d1604 added firefox 2013-12-16 11:16:52 +01:00
Frank Celler 99c79485e8 added firefox 2013-12-16 11:14:27 +01:00
Michael Hackstein 08fc5db114 GraphViewer readed pannign buttons, got deleted by accident 2013-12-13 23:16:34 +01:00
Michael Hackstein b7a34326f9 GraphViewer Added a context menu for edges 2013-12-13 23:14:28 +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 ed61b5272e added missing initialiser 2013-12-13 17:11:49 +01:00
Max Neunhoeffer 60eee47336 Next draft of ClusterComm API. 
ClusterComm internals are unready and subject to change.
ClusterComm thread is not yet started and shut down.
ClusterState does not do anything (yet).
 2013-12-13 17:07:18 +01:00
Heiko Kernbach 3f1ffd2d70 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-12-13 16:11:23 +01:00
Heiko Kernbach 040db09706 css, icons 2013-12-13 16:11:17 +01:00
Jan Steemann 21d5abf15d updated CHANGELOG 2013-12-13 16:06:14 +01:00
Max Neunhoeffer 145fa2562e Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 
Conflicts:
	arangod/Makefile.files
 2013-12-13 16:06:01 +01:00
Max Neunhoeffer 721681b4ee Move Cluster state information to its own class. 2013-12-13 16:04:54 +01:00
Heiko Kernbach f4e4e411cf icons 2013-12-13 16:01:07 +01:00
Jan Steemann 0a2e39085f Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-12-13 15:59:15 +01:00
Jan Steemann ed927d26c8 split big group of statistics into 2 separate groups 2013-12-13 15:58:59 +01:00
Heiko Kernbach 72a9d6f14f icons 2013-12-13 15:52:20 +01:00
Heiko Kernbach fc9038dcfa changed icons to new arango icon set 2013-12-13 15:44:09 +01:00
Heiko Kernbach 05976d1072 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-12-13 13:56:24 +01:00
Michael Hackstein 05a2baff05 The right-click context menu is now disabled in context of the SVG 2013-12-13 13:06:22 +01:00
Jan Steemann b624d42e2e Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-12-13 12:38:59 +01:00
Heiko Kernbach 839112dbad Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-12-13 12:36:17 +01:00
Jan Steemann 865b70862e some minor adjustments for arangodump and arangorestore 2013-12-13 11:54:00 +01:00
Michael Hackstein 8624ab3278 GraphViewer: Whenever the content of the adapter is reseted now the content of the colourmap is reseted as well 2013-12-13 11:43:33 +01:00