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

39481 Commits

Author SHA1 Message Date
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
Wilfried Goesgens 31748f2fe4 fix app directory 2017-04-26 14:12:23 +02:00
Simon Grätzer bdd002d6ec Fixing incremental sync deletion 2017-04-26 14:11:51 +02:00
Wilfried Goesgens c69c4dd504 behave similar to jenkins 2017-04-26 14:04:21 +02:00
Frank Celler 34fb4768b5 Merge pull request #2401 from de3/devel 
Fix result value from queue worker
 2017-04-26 14:03:33 +02:00
Frank Celler b1f8fdbef9 Merge pull request #2456 from servusoft/devel 
cross compiling
 2017-04-26 13:59:36 +02:00
jsteemann 631be66ba8 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-26 13:37:51 +02:00
jsteemann 9161d48788 changed option description 2017-04-26 13:37:40 +02:00
Wilfried Goesgens 5f02bb4534 we may only execute nightly foxx-manager tests so we don't stress out github. 2017-04-26 13:34:31 +02:00
Simon Grätzer b5c7906dce Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-26 13:32:17 +02:00
Simon Grätzer 02e41de608 Working on replication 2017-04-26 13:32:12 +02:00
jsteemann 48526109b5 removed outdated file 2017-04-26 13:31:08 +02:00
jsteemann 1328142509 updated release notes 2017-04-26 13:26:55 +02:00
jsteemann 4479f38581 updated CHANGELOG 2017-04-26 13:21:56 +02:00
jsteemann 0b8521f186 updated CHANGELOG 2017-04-26 13:14:51 +02:00
hkernbach 575ada7f2b removed console logs 2017-04-26 12:16:14 +02:00
hkernbach 1543f9a7a2 CHANGELOG 2017-04-26 12:14:35 +02:00
hkernbach a01e4a014a Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-04-26 12:12:41 +02:00
hkernbach 25083059c7 fixed issue: #2453 2017-04-26 12:12:02 +02:00
jsteemann 99dc29d0e6 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-26 12:11:37 +02:00
jsteemann b7de569a27 change log level for debugging 2017-04-26 12:07:28 +02:00
Kaveh Vahedipour 27275e3686 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-26 12:07:03 +02:00
Kaveh Vahedipour 0d96ba4f4b merge from 3.1 2017-04-26 12:06:43 +02:00
Simon Grätzer a8285641fb Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-26 11:30:44 +02:00
jsteemann d3c165cb8f allow periodic tasks to cancel themselves 2017-04-26 11:28:43 +02:00
Simon Grätzer 6472c4928d Various warnings 2017-04-26 11:26:08 +02:00
Frank Celler ab7bcfe224 --server.maximal-queue-size is now an absolute maximum 2017-04-26 11:20:56 +02:00
Max Neunhoeffer 067a4510a8 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2017-04-26 11:17:24 +02:00
Max Neunhoeffer d3f492158c Port 3.1 fixes to devel, move something into try block. 2017-04-26 11:17:08 +02:00
jsteemann 7283e0d793 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-26 11:15:42 +02:00
jsteemann 664c6fc83c added more marker types 2017-04-26 11:15:33 +02:00
baslr 87b3aa3e55 Merge branch 'feature/ldap-auth' of github.com:arangodb/arangodb into feature/ldap-auth 2017-04-26 11:12:51 +02:00
Jan Christoph Uhde 42eb179e76 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 
* 'devel' of https://github.com/arangodb/arangodb: (25 commits)
  fix writing of crash summary textfile
  reduce lines in output
  give the system some time to write the core dumps
  Removed double include due to hidden merge conflict.
  db._explain should now be backwards-compatible if we access a 3.1 instance with a 3.2 arangosh
  Port 3.1 changes to devel, startStandAloneAgency.sh.
  add missing include files
  Fixed missing includes
  Fixed compile bugin shortest path
  Fix compile bug
  ShortestPathBlock does not use EdgeCollectionInfo anymore. Replaced by EdgeCursors
  ClusterComm cherry pick from 3.1
  Port 3.1 fixes to devel, new test.
  Port 3.1 fixes to devel, update tests.
  Further unnecessary friends and member variables removed
  Port 3.1 fixes to devel, add an access method.
  disable currently unused variable
  remove useless variable
  Port 3.1 fixes to devel, support setting the agencyPrefix again.
  Port 3.1 fixes to devel, typo.
  ...
 2017-04-26 11:08:59 +02:00
Wilfried Goesgens 0b7e07f096 fix writing of crash summary textfile 2017-04-26 11:08:21 +02:00