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:triAGENS/ArangoDB into devel

This commit is contained in:
Michael Hackstein 2014-03-04 15:37:51 +01:00
parent 169b3f3138 87e5bf0bc3
commit 3d5456820f
7 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG
View File

@ -220,6 +220,7 @@ v2.0.0-rc1 (2014-02-28)
v1.4.11 (2014-02-27)
--------------------
* added SHORTEST_PATH AQL function

6
Documentation/Cookbooks/CookbookCluster.md
View File

@ -1,5 +1,5 @@
Stir up your ArangoDB Cluster{#CookbookCluster}
=============================
Set up your ArangoDB Cluster{#CookbookCluster}
============================
Setting up a cluster can be intimidating task. You have to deal with
firewalls, ports, different types of machines, and the like. ArangoDB
@ -75,6 +75,8 @@ Use your favorite web browser and go to
You will now see the cluster management frontend.
![Create Cluster Dialog](cluster-create-dialog.png)
Select `Single Machine` scenario. The next page allows you to enter
the number of coordinators and database servers.

1
Documentation/Makefile.files
View File

@ -401,6 +401,7 @@ publish-html:
mkdir -p $(OUTPUT_FOLDER)/images
@for w in $(WIKI); do cp Doxygen/website/$$w.html $(OUTPUT_FOLDER); done
@for i in `ls Doxygen/website/images/*.png`; do cp $$i $(OUTPUT_FOLDER)/images/; done
@for i in `ls Doxygen/website/*.png`; do cp $$i $(OUTPUT_FOLDER)/; done
@cp Doxygen/website/arangodb.css $(OUTPUT_FOLDER)
@cp Documentation/Manual/shell_reference_card.pdf $(OUTPUT_FOLDER)

1
js/actions/api-cluster.js
View File

@ -730,7 +730,6 @@ actions.defineHttp({
res.responseCode = actions.HTTP_OK;
res.body = JSON.stringify({result : cursor.docs});
} else {
var DBserver = req.parameters.DBserver;
var coord = { coordTransactionID: ArangoClusterInfo.uniqid() };
var options = { coordTransactionID: coord.coordTransactionID, timeout:10 };
var op = ArangoClusterComm.asyncRequest("POST","server:"+DBserver,"_system",

2
js/apps/system/aardvark/frontend/js/templates/navigationView.ejs
View File

@ -48,7 +48,7 @@
<li class="divider"></li>
<li class="dropdown-header">Social</li>
<li class="dropdown-item"><a href="https://twitter.com/arangodb" target="_blank">Twitter</a></li>
<li class="dropdown-item"><a href="https://www.arangodb.org/connect" target="_blank">Announcement List</a>
<li class="dropdown-item"><a href="https://www.arangodb.org/community" target="_blank">Contact</a>
</li>
<li class="dropdown-item"><a href="https://stackoverflow.com/questions/tagged/arangodb" target="_blank">StackOverflow</a>
</li>

2
js/apps/system/aardvark/frontend/js/templates/userProfileView.ejs
View File

@ -10,7 +10,7 @@
<div class="contentDiv" id="profileContent">
<table class="arangoDataTable contentTables">
<tr>
<td style="float: right">
<td class="pull-right">
<%=img%>
</td>
<td>

2
js/common/modules/org/arangodb/statistics.js
View File

@ -1,5 +1,5 @@
/*jslint indent: 2, nomen: true, maxlen: 100, white: true, plusplus: true, eqeq: true */
/*global require, exports */
/*global require, exports, ArangoServerState */
////////////////////////////////////////////////////////////////////////////////
/// @brief statistics handler