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

10653 Commits

Author SHA1 Message Date
hkernbach 5b03dfef1e new collection view + subviews 2016-04-14 22:49:39 +02:00
jsteemann 87c79ca41c Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-14 22:03:32 +02:00
jsteemann ad062b0566 turn off trace-level logging 2016-04-14 22:03:21 +02:00
hkernbach bcaadd878f Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-14 21:56:52 +02:00
hkernbach 5c153730d2 view, subviews, scss 2016-04-14 21:56:43 +02:00
Max Neunhoeffer dab12cbeed Take out a debugging message. 2016-04-14 20:20:56 +02:00
Michael Hackstein 2f5910f828 Removed debug output and deactivated TRACE log level during tests 2016-04-14 20:15:26 +02:00
Michael Hackstein 483ca0d5b3 Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-04-14 17:42:41 +02:00
Michael Hackstein 3434be7b7a Implemented documents baby variant for cluster and also improved the baby tests. ALl errors will now have exactly one representation for each baby document even if they could be identified earlier. 2016-04-14 17:40:28 +02:00
Kaveh Vahedipour f9716fee62 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-14 16:41:18 +02:00
Kaveh Vahedipour 393b068ac4 store's operator handling 2016-04-14 16:40:25 +02:00
hkernbach 20c80aa35e Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-14 15:38:47 +02:00
hkernbach b7e6b5dfca jslint frontend 2016-04-14 15:38:39 +02:00
Andreas Streichardt 3160b3cccb Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-14 15:30:34 +02:00
Andreas Streichardt 10461fe369 Fix cluster shutdown time 2016-04-14 15:30:19 +02:00
Kaveh Vahedipour 05db051950 agency test for assigning objects through op set new ttl 2016-04-14 14:34:15 +02:00
hkernbach 128caabd92 scss lint 2016-04-14 13:54:09 +02:00
hkernbach 020c3df628 lib + frontend grunt build 2016-04-14 13:24:18 +02:00
hkernbach 163e58898b Merge remote-tracking branch 'origin/frontendmerge' into devel 2016-04-14 13:08:43 +02:00
hkernbach 526b686cc5 grunt 2016-04-14 13:01:17 +02:00
hkernbach 9d3386cc28 frontend 2016-04-14 13:00:27 +02:00
hkernbach 4ff4729e0f view, scss 2016-04-14 09:43:32 +02:00
Michael Hackstein 4d02abeaa9 Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-04-14 09:05:56 +02:00
Michael Hackstein 32a5ed5972 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-14 09:04:34 +02:00
Michael Hackstein bce15b7345 Actually deactivated the agency.wait-for-sync for tests. 2016-04-14 09:04:26 +02:00
Michael Hackstein 1e92fd3485 Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-04-14 08:28:28 +02:00
Andreas Streichardt 0ed24b7465 Merge branch 'agency' into devel 2016-04-13 19:35:30 +02:00
Jan Steemann 576fcab12b Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-13 16:29:26 +02:00
Jan Steemann a0fde1b7b2 allow array values in attribute name bind parameters 2016-04-13 16:29:09 +02:00
Michael Hackstein 1352e3d682 Fixed JSLINT 2016-04-13 15:57:49 +02:00
Kaveh Vahedipour d247e7a3bd mop is fixing the cluster load 2016-04-13 15:36:11 +02:00
hkernbach b9d1712fb0 scss 2016-04-13 15:12:03 +02:00
Michael Hackstein b043b103e0 Optimized IN in AQL pattern Matcher properly. Also added some tests for it 2016-04-13 14:49:21 +02:00
Andreas Streichardt 4c27442bd9 Implement callbacks 2016-04-13 14:05:15 +02:00
hkernbach 79a57b9fc8 view, scss, templates 2016-04-13 11:12:55 +02:00
Michael Hackstein a14d7dffe2 Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-04-13 08:30:48 +02:00
hkernbach 83a385bd74 grunt build 2016-04-12 22:54:47 +02:00
hkernbach e8fd3fb1cb scss style changes 2016-04-12 21:23:00 +02:00
hkernbach b55bac0560 headerbar scss, fixed some view problems caused by backbone update 2016-04-12 18:24:58 +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 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
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
Michael Hackstein 1311f73775 Further fixes in cluster communication for baby case 2016-04-12 13:04:51 +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
hkernbach be3757ccb6 updated nvd3 + d3 2016-04-12 11:50:10 +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
Michael Hackstein 0bc206ff80 Further modification of document babies test 2016-04-12 08:51:16 +02:00
Max Neunhoeffer c9031a648f Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-04-11 23:39:02 +02:00
hkernbach 4857c87818 grunt build 2016-04-11 18:38:58 +02:00
hkernbach 15483723b7 added node(s) view(s) 2016-04-11 18:36:33 +02:00
Michael Hackstein 474f70c9ad Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-04-11 16:33:08 +02:00
Michael Hackstein 5bc4bb51e6 Reactivated babies test in cluster 2016-04-11 16:32:25 +02:00
Michael Hackstein 0ec045d811 Removed debug output 2016-04-11 16:31:41 +02:00
Michael Hackstein 19139a7bf5 Modified document-babies tests. They are now green but correctness has to be discussed. 2016-04-11 16:29:04 +02:00
Wilfried Goesgens 81df4e6e85 migrate 1b41f5c0bb to devel. 2016-04-11 14:21:46 +02:00
Michael Hackstein 7313df2e5f Fixed babies-tests to fit the newest definition 2016-04-11 14:21:34 +02:00
Jan Steemann 947fb8d9ad make LIKE wildcards newline-aware 2016-04-11 14:02:12 +02:00
Michael Hackstein 97623706b3 Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-04-11 10:09:43 +02:00
Alan Plum 1aacd670bc Merge pull request #1797 from Simran-B/devel 
Add unit tests for TO_BOOL() and unary not with a whole document
 2016-04-10 16:35:50 +02:00
Michael Hackstein df497eb8b2 Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-04-10 14:09:25 +02:00
Michael Hackstein 68577f1a45 Fixed expectation of document-babies test. Not yet green 2016-04-10 14:09:18 +02:00
Simran Brucherseifer 5905465c26 Add unit tests for TO_BOOL() and unary not with a whole document 2016-04-09 01:55:00 +02:00
jsteemann e84a0ff0ad jslint argl 2016-04-09 01:02:59 +02:00
jsteemann f94f298862 deactivate babies tests temporarily 2016-04-08 23:50:02 +02:00
hkernbach bb60cef7b3 cluster view 2016-04-08 18:31:29 +02:00
hkernbach 7992591501 fixed some routing issue, scss, fixed a graph issue 2016-04-08 17:51:17 +02:00
hkernbach 229038221c bugfix querview 2016-04-08 15:17:30 +02:00
hkernbach 1013c03e05 added subview functionality 2016-04-08 14:45:28 +02:00
Kaveh Vahedipour c949df2dfc agency compiles after pull from devel 2016-04-08 12:40:38 +00:00
Max Neunhoeffer 1d4abd16a6 Merge branch 'spdvpk' of ssh://github.com/ArangoDB/ArangoDB into spdvpk 2016-04-08 10:28:12 +02:00
Jan Steemann c2749b850f fixed tests 2016-04-07 17:48:51 +02:00
Jan Steemann 6df7221691 cleanup 2016-04-07 17:08:44 +02:00
Jan Steemann 32c0c91926 fixed tests 2016-04-07 17:01:45 +02:00
Jan Steemann ce11474602 jslint 2016-04-07 16:40:21 +02:00
Max Neunhoeffer 130efabdca Export endpointToURL for others to require. 2016-04-07 16:19:26 +02:00
Jan Steemann 74794d16db Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-04-07 14:43:35 +02:00
Michael Hackstein 1b967d9535 Started fixing AQL-failures-noncluster tests. Still two are failing. Return and Sort. 2016-04-07 14:37:18 +02:00
Jan Steemann 4b0c01975b Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-04-07 14:30:36 +02:00
hkernbach 8d7d68158e added mode check 2016-04-07 14:22:17 +02:00
hkernbach c452cb00bc issue #1793 2016-04-07 13:54:11 +02:00
Jan Steemann 83f18fa419 Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-04-07 13:01:23 +02:00
Jan Steemann 513dc26fc1 make replication tests more deterministic 2016-04-07 13:00:30 +02:00
hkernbach 81faa5b08b grunt 2016-04-07 12:57:53 +02:00
hkernbach f2691ba818 issue #1793 2016-04-07 12:54:16 +02:00
Michael Hackstein 015c5d2908 Fixed single-server babies test. Also made sure that the error header is capialized properly 2016-04-07 12:41:23 +02:00
Michael Hackstein 3e1b295d68 Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-04-07 10:30:41 +02:00
Michael Hackstein 6847d3f4a7 Preperation to create documents on coordinator with baby awareness. 2016-04-07 10:27:01 +02:00
Kaveh Vahedipour a315997617 callback redesign 2016-04-07 10:20:08 +02:00
hkernbach 00fb467592 Merge remote-tracking branch 'origin/devel' into frontendmerge 2016-04-06 19:06:46 +02:00
Jan Steemann 2a12f3d936 make tests a bit more robust? 2016-04-06 17:57:57 +02:00
Jan Steemann b5b1fd705c removed obsolete tests 2016-04-06 17:48:11 +02:00
hkernbach 090f5416a3 grunt 2016-04-06 17:45:33 +02:00
hkernbach 4578b66441 merging web interfaces 2016-04-06 17:44:22 +02:00
Jan Steemann a62d863238 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-04-06 17:39:34 +02:00
Andreas Streichardt bdda4952ef Fix replication still requiring planner 2016-04-06 17:34:43 +02:00
Jan Steemann aae8ffa5e3 Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-04-06 15:46:47 +02:00
Jan Steemann 9f8c24b1cd Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-04-06 15:43:27 +02:00
Kaveh Vahedipour 57619d105c new document api 2016-04-06 13:43:31 +02:00
Michael Hackstein ff195124d2 Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-04-06 09:51:30 +02:00
Michael Hackstein 074e949037 Fixed JSHINT 2016-04-06 09:51:19 +02:00
Jan Steemann f45b6eeb49 jslint 2016-04-06 09:50:39 +02:00
Michael Hackstein 25df08e872 Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-04-06 09:47:28 +02:00
Jan Steemann 18204c57e8 fixed replication tests 2016-04-06 09:41:31 +02:00
Michael Hackstein 98b4c43315 Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-04-06 09:30:11 +02:00
Andreas Streichardt 3bdbded541 Fix linter errors 2016-04-05 18:45:39 +02:00
Andreas Streichardt c2cf4be4e0 Remove etcd 2016-04-05 18:41:37 +02:00
Jan Steemann 782b38e5fa Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-04-05 18:32:24 +02:00
Jan Steemann d0f368445a replication fixes 2016-04-05 18:32:09 +02:00
Andreas Streichardt d2d7af67fe Kickstarter and planner are dead 2016-04-05 17:45:39 +02:00
Michael Hackstein 1d43063189 Added check for error-code headers in new babies definition 2016-04-05 15:51:16 +02:00
Michael Hackstein 964535c315 Adapted document-babies-spec to newest version of babies API for insertion of documents. Test is now red 2016-04-05 14:54:58 +02:00
Andreas Streichardt bad100312f fix testing 2016-04-05 14:16:48 +02:00
Andreas Streichardt 529199a9c3 streamline error log handling 2016-04-05 13:35:48 +02:00
Andreas Streichardt d46fba735b Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-05 12:19:10 +02:00
Andreas Streichardt 0ac34f174a Fix agency test invocation 2016-04-05 12:18:53 +02:00
Jan Steemann 368f7e7f69 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-05 11:29:58 +02:00
Jan Steemann 19c06e01dd fixed wrong text 2016-04-05 11:29:41 +02:00
Andreas Streichardt 8859ee1de4 Fix line ending madness 
treat csv files as binary so we can CONSISTENTLY import csv files
containing \r\n on any system
 2016-04-05 11:21:24 +02:00
Michael Hackstein bdb0261d2e Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-04-05 10:32:06 +02:00
Michael Hackstein 64308f8ef5 General Graph now uses the new version to save edges with only one json object. instead of the (from, to, doc) used before 2016-04-05 10:31:50 +02:00
Andreas Streichardt 6554cd9cee Fix dumpand restore stuff 2016-04-05 10:31:33 +02:00
Max Neunhoeffer 765b6f6685 Merge branch 'spdvpk' of ssh://github.com/ArangoDB/ArangoDB into spdvpk 2016-04-05 10:28:21 +02:00
Max Neunhoeffer b1963d2cee Fix replication in the sense that revs are now copied over. 2016-04-05 10:27:43 +02:00
Andreas Streichardt bda650e112 remove oboslete variables 2016-04-05 08:46:21 +02:00
Andreas Streichardt 47facc7f50 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-04 19:27:53 +02:00
Andreas Streichardt 49a3d3e018 Cleaning up the ifs....Greatly simplifying testing.js 2016-04-04 19:26:30 +02:00
Michael Hackstein 715c6fccf6 Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-04-04 18:41:40 +02:00
Michael Hackstein dc58c5d769 Fixed Modify edges in cluster test. Expected old return codes 2016-04-04 18:41:28 +02:00
Jan Steemann ebeb119f4d some test fixes 2016-04-04 18:20:18 +02:00
Andreas Streichardt a0e6778ab2 fix jslint 2016-04-04 18:16:45 +02:00
Andreas Streichardt 91df9e36b2 Merge branch 'agency' into devel 2016-04-04 15:50:25 +02:00
Andreas Streichardt 675ccf06f9 Merge branch 'agency' of github.com:arangodb/arangodb into agency 2016-04-04 15:22:42 +02:00
Andreas Streichardt 1150d2b06a Talk to coordinator 2016-04-04 15:11:10 +02:00
Kaveh Vahedipour 9bfa55120a Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-04 14:58:34 +02:00
Kaveh Vahedipour 47bac5b4d9 temporary fix of jslint errors 2016-04-04 14:58:25 +02:00
Kaveh Vahedipour 3d3f11ef54 comments 2016-04-04 12:55:18 +00:00
Kaveh Vahedipour 5caf02768c code beautification 2016-04-04 14:42:49 +02:00
Kaveh Vahedipour 062a759bca Merge branch 'agency' of https://github.com/arangodb/arangodb into devel 2016-04-04 12:13:48 +00:00
Kaveh Vahedipour 723eb01cee merging back from agency 2016-04-04 12:13:43 +00:00
Andreas Streichardt e5850658fb Merge branch 'devel' of github.com:arangodb/arangodb into agency 2016-04-04 13:36:22 +02:00