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

28780 Commits

Author SHA1 Message Date
Jan Steemann d0296b38e9 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-12 18:27:53 +02:00
Jan 7cd428c367 Merge pull request #1798 from ObiWahn/devel 
optional velocypack response
 2016-04-12 18:27:08 +02:00
hkernbach b55bac0560 headerbar scss, fixed some view problems caused by backbone update 2016-04-12 18:24:58 +02:00
Jan Steemann c0fd5c5f78 removal of some JSON 2016-04-12 18:21:11 +02:00
hkernbach ba147c73bd grunt 2016-04-12 17:00:43 +02:00
hkernbach 9576c3104b nodes view 2016-04-12 17:00:29 +02:00
hkernbach dbe2c17ae5 scss, updated backbone & underscore libs, views 2016-04-12 16:53:24 +02:00
Jan Steemann c49166d40e do not log traces! 2016-04-12 16:37:48 +02:00
Jan Steemann 51bfb8fe57 remove TRI_json_t 2016-04-12 16:37:36 +02:00
Kaveh Vahedipour 1d124b8166 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-12 16:01:48 +02:00
Kaveh Vahedipour 237b190032 correct callback jsons 2016-04-12 16:01:36 +02:00
Kaveh Vahedipour 9bd08b98c4 correct callback jsons 2016-04-12 16:01:00 +02:00
Wilfried Goesgens d0692b90f0 fix typo 2016-04-12 15:12:36 +02:00
Jan Steemann 0c272978d9 use THROW_ARANGO_EXCEPTION 2016-04-12 15:04:17 +02:00
Jan Steemann f2c8df7db7 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-12 14:51:37 +02:00
Jan Steemann 9163236f2b renamed optimizer rule "merge-traversal-filter" into "optimize-traversals" 2016-04-12 14:51:15 +02:00
Andreas Streichardt 747d3157b2 Merge branch 'agency' of github.com:arangodb/arangodb into agency 2016-04-12 14:42:45 +02:00
Kaveh Vahedipour c2665a63f8 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-12 14:20:56 +02:00
Kaveh Vahedipour b44af0ab60 new simple URI form from endpoint 2016-04-12 14:20:47 +02:00
Michael Hackstein 50535f6ad8 Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-04-12 14:12:06 +02:00
Andreas Streichardt 8354acca0d Merge github.com:arangodb/arangodb into devel 2016-04-12 14:11:22 +02:00
Andreas Streichardt 7b90f3040c parallelize cluster instance startup during test 2016-04-12 14:10:38 +02:00
Kaveh Vahedipour 0efa889f43 new simple URI form from endpoint 2016-04-12 14:10:18 +02:00
Michael Hackstein 4430f22840 Cluster delete now forwards ignoreRevs properly 2016-04-12 13:24:32 +02:00
Michael Hackstein 1311f73775 Further fixes in cluster communication for baby case 2016-04-12 13:04:51 +02:00
Kaveh Vahedipour 7d608b160f introducing cluster sanity checking to agency 2016-04-12 12:56:12 +02:00
Kaveh Vahedipour d80df74071 introducing cluster sanity checking to agency 2016-04-12 12:52:15 +02:00
hkernbach 2e2712b4bf grunt build 2016-04-12 12:35:12 +02:00
hkernbach c819c00c9b views, router 2016-04-12 12:34:46 +02:00
hkernbach 46bd354bd3 dashboard configuration 2016-04-12 12:34:31 +02:00
hkernbach 2f5bb27e4a scss 2016-04-12 12:34:01 +02:00
hkernbach a48b935be6 views 2016-04-12 12:33:47 +02:00
Kaveh Vahedipour 9853b9662c introducing cluster sanity checking to agency 2016-04-12 12:10:46 +02:00
hkernbach be3757ccb6 updated nvd3 + d3 2016-04-12 11:50:10 +02:00
Kaveh Vahedipour 66636cdb7d introducing cluster sanity checking to agency 2016-04-12 11:35:27 +02:00
Kaveh Vahedipour 9a608f3037 introducing cluster sanity checking to agency 2016-04-12 11:04:37 +02:00
Kaveh Vahedipour b7c2a03558 introducing cluster sanity checking to agency 2016-04-12 10:59:18 +02:00
Michael Hackstein 7991815376 Fixed property undefiend bug in test 2016-04-12 10:39:30 +02:00
Michael Hackstein eeb11919f9 Fixed expectation in cluster-crud test. We cannot guarantee that CHANGE_SHARDING_ATTRIBUTES is thrown, might be NOT_FOUND in some cases 2016-04-12 10:35:09 +02:00
Kaveh Vahedipour 6dfa9baaf2 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-12 10:26:00 +02:00
Kaveh Vahedipour bf95261493 introducing cluster sanity checking to agency 2016-04-12 10:25:52 +02:00
Michael Hackstein b9a209fff2 Now sending non-babies request in modify to non babies endpoint instead of a faked babies object. Result was different. 2016-04-12 10:22:27 +02:00
Michael Hackstein 68951f3a04 Fixed a bug in URL parameters 2016-04-12 09:11:05 +02:00
Michael Hackstein 04f796e9a1 Activated babies in cluster replace 2016-04-12 09:10:50 +02:00
Michael Hackstein 0bc206ff80 Further modification of document babies test 2016-04-12 08:51:16 +02:00
Michael Hackstein 3927fd06de Fixed nullptr bug 2016-04-12 08:28:12 +02:00
Michael Hackstein 8760f10354 Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-04-12 08:01:40 +02:00
Michael Hackstein 55ed0f52b0 Potential fix for some modifyDocument operations in cluster 2016-04-12 08:01:17 +02:00
Max Neunhoeffer c9031a648f Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-04-11 23:39:02 +02:00
Max Neunhoeffer 99de60c6fc First version of synchronous replication for insertLocal. 2016-04-11 23:38:02 +02:00