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

22727 Commits

Author SHA1 Message Date
Jan Steemann c76bdade66 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-08-25 17:36:09 +02:00
Jan Steemann 75ad81401b slightly improved logging 2015-08-25 17:35:54 +02:00
Willi Goesgens 7b081fb6f3 print usefull error if we fail to start procdump. 2015-08-25 17:14:44 +02:00
Jan Steemann a440d65ee2 fix limits 2015-08-25 16:57:00 +02:00
Michael Hackstein 40c1361244 Merge branch 'devel' of github.com:arangodb/arangodb into array_indexing 2015-08-25 16:40:31 +02:00
Max Neunhoeffer 93caabb397 Fix fix. 2015-08-25 16:17:02 +02:00
Max Neunhoeffer 66498a56c3 Fix hash function for AssocMulti usage in hash-multi-index. 2015-08-25 16:13:43 +02:00
Jan Steemann 1e1196c55e Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-08-25 16:09:26 +02:00
Jan Steemann 18f231f666 do not read memory for comparisons 2015-08-25 16:09:12 +02:00
Jan Steemann 1911d4086d forgot to commit 2015-08-25 16:08:46 +02:00
Jan Steemann 7540059f36 uint32_t => uint64_t 2015-08-25 15:08:09 +02:00
hkernbach 9ed2e4b3b1 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2015-08-25 13:54:00 +02:00
hkernbach 63903bc1bf webui: loginView, css 2015-08-25 13:53:46 +02:00
Jan Steemann b71c880bbd Merge branch 'replication' of https://github.com/arangodb/arangodb into devel 2015-08-25 13:19:24 +02:00
Jan Steemann 52af8c5781 added comments 2015-08-25 13:16:07 +02:00
Max Neunhoeffer 7957df9215 Merge branch 'array_indexing' of ssh://github.com/ArangoDB/ArangoDB into array_indexing 2015-08-25 13:04:48 +02:00
Jan Steemann 1af238a6d5 added tests for requireFromIncluded 2015-08-25 12:50:58 +02:00
Max Neunhoeffer 203e9a5195 Make hashcache in AssocMulti switchable-off. Does not work yet. 2015-08-25 12:46:47 +02:00
Michael Hackstein 57c6103458 Revert "The AssocUnique index now requires only an element to insert it. They key is derived" 
This reverts commit ea70a948e254716905a7619e72b41fbef4f66695.
 2015-08-25 09:40:29 +02:00
hkernbach 98a5108a27 scss lint 2015-08-25 09:17:51 +02:00
hkernbach b5c3c1b09a web ui radio, checkboxes 2015-08-24 18:37:18 +02:00
Jan Steemann 0cbff7b75a Merge branch 'devel' of https://github.com/arangodb/arangodb into replication 2015-08-24 17:40:19 +02:00
Jan Steemann 03fa10dad8 less initial syncing when resuming replication 2015-08-24 17:39:11 +02:00
Michael Hackstein 2d6af6e872 The AssocUnique index now requires only an element to insert it. They key is derived 2015-08-24 17:14:39 +02:00
Michael Hackstein 5b6f8b7b8e Added a remove by key function to AssocUnique 2015-08-24 17:06:21 +02:00
Michael Hackstein ba8264eada AssocUnique is now a templated index. Foundation to move primary index to use it 2015-08-24 16:41:16 +02:00
hkernbach b2e9fa4576 login view, authentication web ui bug, scss-lint 2015-08-24 16:39:00 +02:00
hkernbach 3ea73722d4 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2015-08-24 15:36:29 +02:00
hkernbach 8d49d01cb2 userlogo web ui bugfix, scss lint 2015-08-24 15:36:22 +02:00
Willi Goesgens 3f5ad7c52d Work on VS2015 compatibility 2015-08-24 15:28:31 +02:00
hkernbach 4d9d3f4c07 scss lint 2015-08-24 15:22:43 +02:00
Jan Steemann 91b8ad757a Merge branch 'devel' of https://github.com/arangodb/arangodb into replication 2015-08-24 15:20:28 +02:00
Michael Hackstein 855cc0fc96 Removed all functionality from hash-array. To be removed 2015-08-24 14:55:55 +02:00
hkernbach e00a0e6971 merge 2015-08-24 14:52:40 +02:00
hkernbach 0d154ea124 web ui, scss lint 2015-08-24 14:52:24 +02:00
Michael Hackstein f9647962d7 Moved HashIndex/hash-array.h to Basics/AssocUnique.h 2015-08-24 14:17:49 +02:00
Michael Hackstein 80e1f6decc Started templatefying hash-array to AssocUnique 2015-08-24 14:16:45 +02:00
Willi Goesgens 65cd1b68f3 pull variables out of the batch files together into the makefile - so the user can override the default settings. 2015-08-24 13:56:18 +02:00
Michael Hackstein 2dd0f7cf7f Continued @neunhoef 's on simplification of hash-index. The index itself will never free anything, calling class is responsible for freeing now. 2015-08-24 13:14:35 +02:00
Jan Steemann 37da76546c re-introduced tracking of replication "clients" 2015-08-24 12:02:57 +02:00
Michael Hackstein 22ddc3923f Fixed AttributeName parser tests 2015-08-24 11:49:40 +02:00
hkernbach e2727c7297 merge 2015-08-24 11:44:31 +02:00
hkernbach 5988f06377 updated jsoneditor lib, fixed issue 1446 2015-08-24 11:44:13 +02:00
Michael Hackstein d43c515b56 Fixed a bug in hash index buckets. When resizing the table was not nulled correctly. 2015-08-24 11:22:53 +02:00
Jan Steemann bbd8a643bd Merge branch 'devel' of https://github.com/arangodb/arangodb into replication 2015-08-24 11:10:01 +02:00
Jan Steemann b08713d768 added tests and documentation 2015-08-24 11:05:26 +02:00
Willi Goesgens 89c58351d2 Merge pull request #1453 from CoDEmanX/devel 
Improvements to documentation building
 2015-08-24 10:19:17 +02:00
Jan Steemann 893f9592f8 Merge branch 'devel' of https://github.com/arangodb/arangodb into replication 2015-08-24 09:58:04 +02:00
Jan Steemann deafaf7c2d updated CHANGELOG 2015-08-24 09:57:47 +02:00
hkernbach 15876a591e web ui design 2015-08-24 09:54:41 +02:00