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

Merge branch 'agency' into devel

This commit is contained in:
Andreas Streichardt 2016-04-04 15:50:25 +02:00
parent 005e8dfd00 a2b8bb92f2
commit 91df9e36b2
3 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arangod/Agency/Store.cpp
View File

@ -625,10 +625,6 @@ void Store::beginShutdown() {
} }
void Store::clearTimeTable () { void Store::clearTimeTable () {
<<<<<<< HEAD
=======
>>>>>>> 5caf02768c711fe1d811bb58d5451f86ac38b02f
for (auto it = _time_table.cbegin(); it != _time_table.cend(); ++it) { for (auto it = _time_table.cbegin(); it != _time_table.cend(); ++it) {
if (it->first < std::chrono::system_clock::now()) { if (it->first < std::chrono::system_clock::now()) {
query_t tmp = std::make_shared<Builder>(); query_t tmp = std::make_shared<Builder>();
@ -641,10 +637,6 @@ void Store::clearTimeTable () {
break; break;
} }
} }
<<<<<<< HEAD
=======
>>>>>>> 5caf02768c711fe1d811bb58d5451f86ac38b02f
} }

1
arangod/Agency/Store.h
View File

@ -71,7 +71,6 @@ typedef std::map<std::shared_ptr<Node>, TimePoint> TableTime;
class Node { class Node {
public: public:
// @brief Slash-segemented path // @brief Slash-segemented path
typedef std::vector<std::string> PathType; typedef std::vector<std::string> PathType;

3
js/client/modules/@arangodb/testing.js
View File

@ -828,7 +828,6 @@ function performTests(options, testList, testname) {
} }
print("\n" + Date() + " arangod: Trying", te, "..."); print("\n" + Date() + " arangod: Trying", te, "...");
let reply = runThere(options, instanceInfo, te); let reply = runThere(options, instanceInfo, te);
if (reply.hasOwnProperty('status')) { if (reply.hasOwnProperty('status')) {
@ -1781,7 +1780,7 @@ function startInstance(protocol, options, addArgs, testname, tmpDir) {
instanceInfo.url = url; instanceInfo.url = url;
} else { } else {
instanceInfo.urls = instanceInfo.endpoints.map(endpointToURL); instanceInfo.urls = instanceInfo.endpoints.map(endpointToURL);
url = instanceInfo.urls[0]; url = instanceInfo.urls[instanceInfo.urls.length - 1];
instanceInfo.url = url; instanceInfo.url = url;
} }