Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'devel' of github.com:arangodb/arangodb into devel

This commit is contained in:
hkernbach 2016-10-18 10:49:31 +02:00
parent abbd47099f 5640ad7b65
commit c531a8f96e
5 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Documentation/Books/Manual/ReleaseNotes/NewFeatures31.mdpp Normal file
View File

@ -0,0 +1,6 @@
!CHAPTER Features and Improvements
The following list shows in detail which features have been added or improved in
ArangoDB 3.1. ArangoDB 3.1 also contains several bugfixes that are not listed
here.

5
Documentation/Books/Manual/ReleaseNotes/UpgradingChanges31.mdpp Normal file
View File

@ -0,0 +1,5 @@
!CHAPTER Incompatible changes in ArangoDB 3.1
It is recommended to check the following list of incompatible changes **before**
upgrading to ArangoDB 3.1, and adjust any client programs if necessary.

1
arangod/Agency/Constituent.cpp
View File

@ -280,7 +280,6 @@ bool Constituent::vote(term_t term, std::string id, index_t prevLogIndex,
TRI_ASSERT(_vocbase);
term_t t = 0;
std::string lid;
MUTEX_LOCKER(guard, _castLock);

1
arangod/Replication/Syncer.cpp
View File

@ -97,7 +97,6 @@ Syncer::Syncer(TRI_vocbase_t* vocbase,
std::string username = _configuration._username;
std::string password = _configuration._password;
std::string jwt = _configuration._jwt;
if (!username.empty()) {
_client->setUserNamePassword("/", username, password);

2
lib/Ssl/SslServerFeature.cpp
View File

@ -107,7 +107,7 @@ void SslServerFeature::prepare() {
}
void SslServerFeature::unprepare() {
LOG(INFO) << "unpreparing ssl: " << stringifySslOptions(_sslOptions);
LOG(TRACE) << "unpreparing ssl: " << stringifySslOptions(_sslOptions);
}
namespace {