Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel

arangod/VocBase/LogicalCollection.cpp

@@ -332,6 +332,8 @@ LogicalCollection::LogicalCollection(
       _lastCompactionStamp(0.0),
       _uncollectedLogfileEntries(0) {
   _keyGenerator.reset(KeyGenerator::factory(other.keyOptions()));
+
+  
   
   createPhysical();
 
@@ -695,6 +697,10 @@ std::string const& LogicalCollection::distributeShardsLike() const {
   return _distributeShardsLike;
 }
 
+void LogicalCollection::distributeShardsLike(std::string const& cid) {
+  _distributeShardsLike = cid;
+}
+
 std::string LogicalCollection::dbName() const {
   TRI_ASSERT(_vocbase != nullptr);
   return _vocbase->name();

arangod/VocBase/LogicalCollection.h

@@ -139,6 +139,7 @@ class LogicalCollection {
   std::string dbName() const;
   std::string const& path() const;
   std::string const& distributeShardsLike() const;
+  void distributeShardsLike(std::string const&);
 
   // For normal collections the realNames is just a vector of length 1
   // with its name. For smart edge collections (enterprise only) this is

scripts/startLocalCluster.sh

@@ -73,7 +73,7 @@ while [[ ${1} ]]; do
       shift
       ;;
     -o|--xterm-options)
-      XTERM_OPTIONS=${2}
+      XTERMOPTIONS=${2}
       shift
       ;;
     -h|--help)