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

39264 Commits

Author SHA1 Message Date
mpv1989 af393605db Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-27 11:02:48 +02:00
mpv1989 75afe8e6ad Split tests to fix mac 2017-04-27 11:02:41 +02:00
Kaveh Vahedipour 1109c7b54e typo 2017-04-27 10:43:02 +02:00
Kaveh Vahedipour 641700399b Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-27 10:38:43 +02:00
Kaveh Vahedipour e778604cef distributeShardsLike is not ignored when prototype does not exist 2017-04-27 10:38:07 +02:00
Simon Grätzer 33ed35fa1f Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-27 10:13:17 +02:00
jsteemann a3f5b8f082 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-27 09:27:15 +02:00
jsteemann 12ca8a28d4 fix wrong info. thanks @Simran-B 2017-04-27 09:26:53 +02:00
jsteemann 0de4be0c1d fixed issue #2459 2017-04-27 09:16:37 +02:00
jsteemann 74ccfb2fb3 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-27 08:54:25 +02:00
jsteemann 81c629a685 fixed memleak 2017-04-27 08:54:19 +02:00
Jan Christoph Uhde 278fad9185 fix jslint errors 2017-04-27 08:37:49 +02:00
Jan Christoph Uhde 3261c4ca89 print executed dump/restore command in extremeVerbosity mode 2017-04-27 07:59:38 +02:00
Dan Larkin 6296f88c05 Added stub handler for PutLogData. 2017-04-26 22:49:32 -04:00
Simon Grätzer c10f5abfc0 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 
# Conflicts:
#	arangod/RocksDBEngine/RocksDBLogValue.cpp
#	arangod/RocksDBEngine/RocksDBLogValue.h
 2017-04-26 23:44:28 +02:00
Dan Larkin da30cf862e Updated document markers. 2017-04-26 16:25:12 -04:00
Dan Larkin cc92d280f6 Added document insert/remove markers. 2017-04-26 16:14:15 -04:00
Dan Larkin da03ae693e Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-04-26 15:23:29 -04:00
Dan Larkin f8efe6e627 Added create index and change collection marker creation. 2017-04-26 15:23:25 -04:00
Simon Grätzer 37cbb80d50 Fixed startup exception 2017-04-26 20:35:20 +02:00
Simon Grätzer e87f4321da Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-26 19:27:17 +02:00
Simon Grätzer fa15b43088 Fixed typedefs 2017-04-26 19:27:11 +02:00
hkernbach f8cee76c8f fixed issue: #2457 - (3) 2017-04-26 19:16:53 +02:00
Simon Grätzer 28bc0b38a0 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-26 19:13:04 +02:00
hkernbach fe09e5f684 fixed issue: #2457 - (2) 2017-04-26 19:09:39 +02:00
Simon Grätzer b93c294c41 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 
# Conflicts:
#	arangod/RocksDBEngine/RocksDBLogValue.cpp
 2017-04-26 18:58:29 +02:00
Simon Grätzer 29286a9c1b RocksDB WAL entries for transactions 2017-04-26 18:54:55 +02:00
Michael Hackstein 5ef52aefe8 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-04-26 18:32:38 +02:00
Michael Hackstein e423a5fde1 Added WAL MARKERS for CreateCollection, RenameCollection and DropIndex, also adjested WalMarkerType constructors. 2017-04-26 18:32:28 +02:00
hkernbach 4ac5ca25f5 node info view 2017-04-26 18:16:00 +02:00
hkernbach f61ff4e32a fixed issue: #2457 - (1) 2017-04-26 18:15:40 +02:00
Simon Grätzer bd48154cca Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-26 17:36:41 +02:00
baslr 6c39e1093a new feature ldap auth link 2017-04-26 17:03:24 +02:00
baslr 9671323bf6 added new feature ldap authentication 2017-04-26 17:01:54 +02:00
Simon Grätzer 69f9052569 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-26 17:01:51 +02:00
Simon Grätzer 14a3168e40 Working initial sync 2017-04-26 17:01:35 +02:00
Manuel B ef6a3c31d3 CHANGELOG: added ldap authentication 2017-04-26 16:40:16 +02:00
jsteemann e358c38784 make ctor explicit, dont copy parameters 2017-04-26 16:24:11 +02:00
jsteemann 2ca12c45f8 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-26 16:02:58 +02:00
jsteemann 4aafe2173c updated new features document 2017-04-26 16:02:44 +02:00
hkernbach aa49a297d1 grunt deploy 2017-04-26 16:00:07 +02:00
hkernbach 9a5e1d128e ui 2017-04-26 15:38:09 +02:00
hkernbach 235799a3b9 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-04-26 15:34:48 +02:00
hkernbach 5de5ff320c checking cluster api health 2017-04-26 15:34:40 +02:00
Kaveh Vahedipour f6e5d0f882 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-26 15:32:56 +02:00
Kaveh Vahedipour 68efba18e8 keep agencyPrefix, when non set 2017-04-26 15:32:26 +02:00
jsteemann 8c52ccf6cf add experimental and undocumented flush option for fs.write 2017-04-26 14:52:42 +02:00
Wilfried Goesgens 0383a5cf4d fix app directory 2017-04-26 14:18:32 +02:00
Simon Grätzer 1853447aa0 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-26 14:13:37 +02:00
Frank Celler 33fda9275c Merge pull request #2451 from arangodb/feature/ldap-auth 
Feature/ldap auth
 2017-04-26 14:12:32 +02:00