Merge branch 'stable'

2fed6672 · Konstantin Osipov · d8f02fd9 · da390fed · 2fed6672 · 2fed6672
Commit 2fed6672 authored 11 years ago by Konstantin Osipov
--- a/README.CentOS
+++ b/README.CentOS
@@ -23,7 +23,7 @@ sudo yum install gcc gcc-c++ gcc-objc cmake git readline-devel ncurses-devel bin
 4. Download & build tarantool source code:
 -------------

-git clone git://github.com/mailru/tarantool.git
+git clone git://github.com/tarantool/tarantool.git

 cd tarantool
 CC=gcc463 CXX=g++463 cmake . -DCMAKE_BUILD_TYPE=RelWithDebugInfo -DENABLE_CLIENT=true && make

--- a/README.FreeBSD
+++ b/README.FreeBSD
@@ -29,7 +29,7 @@ sudo make install
 4. Download & build tarantool source code:
 -------------

-git clone git://github.com/mailru/tarantool.git
+git clone git://github.com/tarantool/tarantool.git

 cd tarantool
 CC=gcc463 CXX=g++463 cmake . -DCMAKE_BUILD_TYPE=RelWithDebugInfo -DENABLE_CLIENT=true

--- a/README.MacOSX
+++ b/README.MacOSX
@@ -22,7 +22,7 @@ the module's archive deflates into.
 3. Download & build tarantool source code:
 -------------

-git clone git://github.com/mailru/tarantool.git
+git clone git://github.com/tarantool/tarantool.git

 cd tarantool
 CC=clang CXX=clang++ cmake . -DCMAKE_BUILD_TYPE=RelWithDebugInfo -DENABLE_CLIENT=true

--- a/README.md
+++ b/README.md
-TARANTOOL/BOX, http://tarantool.org
+TARANTOOL, http://tarantool.org

 Tarantool is a framework for in-memory key/value storage and
 Box is a yet another in-memory key-value database.

--- a/connector/c/include/tp.h
+++ b/connector/c/include/tp.h
@@ -6,7 +6,7 @@
 * (http://tarantool.org)
 *
 * protocol description:
- * https://github.com/mailru/tarantool/blob/master/doc/box-protocol.txt
+ * https://github.com/tarantool/tarantool/blob/master/doc/box-protocol.txt
 * -------------------
 *
 * TP - a C library designed to create requests and process
@@ -35,7 +35,7 @@
 *
 * Before using the library, please get acquainted with
 * Tarnatool binary protocol, documented at
- * https://github.com/mailru/tarantool/blob/master/doc/box-protocol.txt
+ * https://github.com/tarantool/tarantool/blob/master/doc/box-protocol.txt
 *
 * BASIC REQUEST STRUCTURE
 * -----------------------
@@ -138,7 +138,7 @@
 *
 * Note: the library itself doesn't contain #defines for server
 * error codes. They are defined in
- * https://github.com/mailru/tarantool/blob/master/include/errcode.h
+ * https://github.com/tarantool/tarantool/blob/master/include/errcode.h
 *
 * A server failure can be either transient or persistent. For
 * example, a failure to allocate memory is transient: as soon as
@@ -171,7 +171,7 @@

 /*
 * Copyright (c) 2012-2013 Tarantool AUTHORS
- * (https://github.com/mailru/tarantool/blob/master/AUTHORS)
+ * (https://github.com/tarantool/tarantool/blob/master/AUTHORS)
 *
 * Redistribution and use in source and binary forms, with or
 * without modification, are permitted provided that the following

--- a/connector/python/README.rst
+++ b/connector/python/README.rst
@@ -2,10 +2,10 @@
 trantool-python
 =================

-Python interface to the `Tarantool database <https://github.com/mailru/tarantool>`_.
+Python interface to the `Tarantool database <https://github.com/tarantool/tarantool>`_.

 The latest version of this package is found at
-`<https://github.com/mailru/tarantool-python`_.
+`<https://github.com/tarantool/tarantool-python`_.

 Tarantool is a fast key/value data store originally designed by `Mail.Ru <http://mail.ru>`_
 and released under the terms of `BSD license <http://www.gnu.org/licenses/license-list.html#ModifiedBSD>`_.

--- a/connector/ruby/README
+++ b/connector/ruby/README
 Tarantool Ruby driver can be found at
-https://github.com/mailru/tarantool-ruby
+https://github.com/tarantool/tarantool-ruby
--- a/debian/control
+++ b/debian/control
@@ -15,8 +15,8 @@ Build-Depends: cdbs, debhelper (>= 8),
 Section: database
 Standards-Version: 3.9.3
 Homepage: http://tarantool.org/
-VCS-Browser: https://github.com/mailru/tarantool
-VCS-Git: git://github.com/mailru/tarantool.git
+VCS-Browser: https://github.com/tarantool/tarantool
+VCS-Git: git://github.com/tarantool/tarantool.git

 Package: tarantool-common
 Architecture: all

--- a/debian/copyright
+++ b/debian/copyright
@@ -2,7 +2,7 @@ Format: http://dep.debian.net/deps/dep5/
 Debianized-By: Dmitry E. Oboukhov <unera@debian.org>
 Upstream-Name: tarantool, tarantool-box
 Upstream-Contact: tarantool-developers@lists.launchpad.net
-Source: https://github.com/mailru/tarantool
+Source: https://github.com/tarantool/tarantool

 Files: third_party/libev/* third_party/coro/*
 Copyright: 2007,2008,2009 Marc Alexander Lehmann.

--- a/debian/watch
+++ b/debian/watch
 version=3
-	https://github.com/mailru/tarantool/tags \
+	https://github.com/tarantool/tarantool/tags \
 		.*/tarball/(\d+(?:\.\d+)+)
--- a/doc/coding-style.txt
+++ b/doc/coding-style.txt
@@ -26,7 +26,7 @@ We use Git for revision control. The latest development
 is happening in the 'master' branch. 
 Our git repository is hosted on github, and can be
 checked out with 
-git clone git://github.com/mailru/tarantool.git # anonymous
+git clone git://github.com/tarantool/tarantool.git # anonymous
 # read-only access

 If you have any questions about Tarantool internals,

--- a/doc/user/configuration-reference.xml
+++ b/doc/user/configuration-reference.xml
@@ -83,7 +83,7 @@ Tarantool 1.4.0-69-g45551dd
        xlink:href="http://www.kernel.org/pub/software/scm/git/docs/git-describe.html">git describe</link> to produce its version id, and
        this id can be used at any time to check out the
        corresponding source from our <link
-        xlink:href="git://github.com/mailru/tarantool.git">git repository</link>.
+        xlink:href="git://github.com/tarantool/tarantool.git">git repository</link>.
      </para></note>
    </listitem>

@@ -205,15 +205,15 @@ Tarantool 1.4.0-69-g45551dd
    Tarantool maintains a set of all allowed configuration
    parameters in two template files, which are easy to maintain
    and extend:
-    <filename xlink:href="https://github.com/mailru/tarantool/blob/master/cfg/core_cfg.cfg_tmpl">cfg/core_cfg.cfg_tmpl</filename>,
-    <filename xlink:href="https://github.com/mailru/tarantool/blob/master/mod/box/box_cfg.cfg_tmpl">src/box/box_cfg.cfg_tmpl</filename>.
+    <filename xlink:href="https://github.com/tarantool/tarantool/blob/master/cfg/core_cfg.cfg_tmpl">cfg/core_cfg.cfg_tmpl</filename>,
+    <filename xlink:href="https://github.com/tarantool/tarantool/blob/master/mod/box/box_cfg.cfg_tmpl">src/box/box_cfg.cfg_tmpl</filename>.
    These files can always be used as a reference for any
    parameter in this manual.
  </para>

  <para>In addition, two working examples can be found in the source tree:
-    <filename xlink:href="https://github.com/mailru/tarantool/blob/master/test/box/tarantool.cfg">test/box/tarantool.cfg</filename>,
-    <filename xlink:href="https://github.com/mailru/tarantool/blob/master/test/box_big/tarantool.cfg">test/box_big/tarantool.cfg</filename>.
+    <filename xlink:href="https://github.com/tarantool/tarantool/blob/master/test/box/tarantool.cfg">test/box/tarantool.cfg</filename>,
+    <filename xlink:href="https://github.com/tarantool/tarantool/blob/master/test/box_big/tarantool.cfg">test/box_big/tarantool.cfg</filename>.
  </para>

  <table frame='all' pgwide='1'>

--- a/doc/user/connectors.xml
+++ b/doc/user/connectors.xml
@@ -17,7 +17,7 @@
    <title>C</title>
    <para>
       Please see <link
-       xlink:href="https://github.com/mailru/tarantool/blob/master/connector/c/include/tp.h"><filename>connector/c</filename></link> in the source tree.
+       xlink:href="https://github.com/tarantool/tarantool/blob/master/connector/c/include/tp.h"><filename>connector/c</filename></link> in the source tree.
    </para>
  </section>

@@ -39,7 +39,7 @@
    <title>PHP</title>
    <para>
       Please see <link
-       xlink:href="https://github.com/mailru/tarantool-php/"><filename>tarantool-php</filename></link> project at GitHub.
+       xlink:href="https://github.com/tarantool/tarantool-php/"><filename>tarantool-php</filename></link> project at GitHub.
    </para>
  </section>

@@ -47,7 +47,7 @@
    <title>Python</title>
    <para>
       Please see <link
-       xlink:href="https://github.com/mailru/tarantool-python"><filename>http://github.com/mailru/tarantool-python</filename></link>.
+       xlink:href="https://github.com/tarantool/tarantool-python"><filename>http://github.com/tarantool/tarantool-python</filename></link>.
    </para>
  </section>

@@ -56,7 +56,7 @@
    <para>
       You need <emphasis role="strong">Ruby 1.9</emphasis> or later
       to use this connector. Connector sources are located in <link
-       xlink:href="https://github.com/mailru/tarantool-ruby"><filename>http://github.com/mailru/tarantool-ruby</filename></link>.
+       xlink:href="https://github.com/tarantool/tarantool-ruby"><filename>http://github.com/tarantool/tarantool-ruby</filename></link>.
    </para>
  </section>


--- a/doc/user/data-model.xml
+++ b/doc/user/data-model.xml
@@ -146,7 +146,7 @@
 </para>
 <para>
  Additional examples of SQL statements can be found in <citetitle
-  xlink:href="https://github.com/mailru/tarantool/tree/master/test/box"
+  xlink:href="https://github.com/tarantool/tarantool/tree/master/test/box"
  xlink:title="Tarantool regression test suite">Tarantool
  regression test suite</citetitle>. A complete grammar of
  supported SQL is provided in <olink targetdoc="tarantool-user-guide" targetptr="language-reference">Language reference</olink> chapter.
@@ -158,7 +158,7 @@
  programming language connector</olink>.  The client/server
  protocol is open and documented: an annotated BNF can be found
  in the source tree, file <filename
-  xlink:href="https://github.com/mailru/tarantool/blob/master/doc/box-protocol.txt" xlink:title="A complete BNF of Tarantool client/server protocol">doc/protocol.txt</filename>.
+  xlink:href="https://github.com/tarantool/tarantool/blob/master/doc/box-protocol.txt" xlink:title="A complete BNF of Tarantool client/server protocol">doc/protocol.txt</filename>.
 </para>

 </section>

--- a/doc/user/errcode.xml
+++ b/doc/user/errcode.xml
@@ -12,7 +12,7 @@ All such messages, however, are logged in the error log. When
 using <emphasis role="strong">Memcached</emphasis> protocol, the error message is sent to the
 client along with the code. Below follow only general descriptions
 of some popular codes. A complete list of errors can be found in
-file <filename xlink:href="https://github.com/mailru/tarantool/blob/master/include/errcode.h">errcode.h</filename> in the source tree.
+file <filename xlink:href="https://github.com/tarantool/tarantool/blob/master/include/errcode.h">errcode.h</filename> in the source tree.

 </para>
 <variablelist>

--- a/doc/user/language-reference.xml
+++ b/doc/user/language-reference.xml
@@ -22,7 +22,7 @@
    <listitem><para>
      Read/write data port, to handle INSERTs, UPDATEs,
      DELETEs, SELECTs and CALLs. This port speaks the
-      <link xlink:href="https://github.com/mailru/tarantool/blob/master/doc/box-protocol.txt" xlink:title="A complete BNF of Tarantool client/server protocol">native Tarantool protocol</link>, and provides full data access.
+      <link xlink:href="https://github.com/tarantool/tarantool/blob/master/doc/box-protocol.txt" xlink:title="A complete BNF of Tarantool client/server protocol">native Tarantool protocol</link>, and provides full data access.
      </para>
      <para>
      The default value of the port is <literal>33013</literal>,
@@ -117,9 +117,9 @@
    A complete description of both, the binary protocol and
    the supported SQL, is maintained in annotated Backus-Naur
    form in the source tree: please see
-    <link xlink:href="https://github.com/mailru/tarantool/blob/master/doc/box-protocol.txt"><filename>doc/box-protocol.txt</filename></link>
+    <link xlink:href="https://github.com/tarantool/tarantool/blob/master/doc/box-protocol.txt"><filename>doc/box-protocol.txt</filename></link>
    and
-    <link xlink:href="https://github.com/mailru/tarantool/blob/master/doc/sql.txt"><filename>doc/sql.txt</filename></link> respectively.
+    <link xlink:href="https://github.com/tarantool/tarantool/blob/master/doc/sql.txt"><filename>doc/sql.txt</filename></link> respectively.
  </para>
  <section xml:id="memcached-protocol">
    <title>Memcached protocol</title>

--- a/doc/user/persistence-architecture.xml
+++ b/doc/user/persistence-architecture.xml
@@ -20,7 +20,7 @@ number of the first record this file contains.
 <para>Apart from a log sequence number and the data change request
 (its format is the same as in the binary protocol and is described
 in <link
-xlink:href="https://github.com/mailru/tarantool/blob/master/doc/box-protocol.txt"><filename>doc/box-protocol.txt</filename></link>),
+xlink:href="https://github.com/tarantool/tarantool/blob/master/doc/box-protocol.txt"><filename>doc/box-protocol.txt</filename></link>),
 each WAL record contains a checksum and a UNIX time stamp.
 </para>


--- a/doc/user/replication.xml
+++ b/doc/user/replication.xml
@@ -65,7 +65,7 @@
    necessary to enable <olink targetptr="replication_port"/> in
    the configuration file. An example configuration file can be
    found in <link
-    xlink:href="https://github.com/mailru/tarantool/blob/master/test/box_replication/cfg/master.cfg"><filename>test/box_replication/cfg/master.cfg</filename></link>. A master with enabled replication_port can accept connections
+    xlink:href="https://github.com/tarantool/tarantool/blob/master/test/box_replication/cfg/master.cfg"><filename>test/box_replication/cfg/master.cfg</filename></link>. A master with enabled replication_port can accept connections
    from as many replicas as necessary on that port. Each replica
    has its own replication state.
  </para>
@@ -91,7 +91,7 @@
    necessary to keep WAL files on the master host as long as
    there are replicas that haven't applied them yet. An example
    configuration can be found in <link
-    xlink:href="https://github.com/mailru/tarantool/blob/master/test/box_replication/cfg/replica.cfg"><filename>test/box_replication/cfg/replica.cfg</filename></link>.
+    xlink:href="https://github.com/tarantool/tarantool/blob/master/test/box_replication/cfg/replica.cfg"><filename>test/box_replication/cfg/replica.cfg</filename></link>.
  </para>
  <para>
    In absence of required WALs, a replica can be "re-seeded" at

--- a/doc/user/stored-procedures.xml
+++ b/doc/user/stored-procedures.xml
@@ -342,7 +342,7 @@ localhost> lua type(i), type(i*2),  type(i/2), i, i*2, i/2
                <simplelist>
                    <member><code>op</code> &mdash; number, any
                    Tarantool command code, except 22 (CALL). See
-                    <link xlink:href="https://github.com/mailru/tarantool/blob/master/doc/box-protocol.txt">
+                    <link xlink:href="https://github.com/tarantool/tarantool/blob/master/doc/box-protocol.txt">
                    <filename>doc/box-protocol.txt</filename></link>.
                    </member>
                    <member><code>request</code> &mdash; command
@@ -955,7 +955,7 @@ lua box.dostring('local f = function(key) t=box.select(0, 0, key); if t ~= nil t
                client as <constant>ER_PROC_LUA</constant>. This function
                makes it possible to emulate any kind of native exception,
                such as a unique constraint violation, no such space/index,
-                etc. A complete list of errors is present in <link xlink:href="https://github.com/mailru/tarantool/blob/master/include/errcode.h">errcode.h</link>
+                etc. A complete list of errors is present in <link xlink:href="https://github.com/tarantool/tarantool/blob/master/include/errcode.h">errcode.h</link>
                file in the source tree.
                Lua constants which correspond to Tarantool errors
                are defined in <code>box.error</code> module. The error
@@ -1239,7 +1239,7 @@ lua box.cjson.decode('{"hello": "world"}').hello
    functions. For example, instead of <code>box.insert(0, ...)</code>
    one can write <code>box.space[0]:insert(...)</code>.
    Package source code is available in file <filename
-    xlink:href="https://github.com/mailru/tarantool/blob/master/src/box/box.lua">src/box/box.lua</filename></para>
+    xlink:href="https://github.com/tarantool/tarantool/blob/master/src/box/box.lua">src/box/box.lua</filename></para>
    <para>A list of all <code>space</code> members follows.</para>
    <varlistentry>
        <term><emphasis role="lua">space.n</emphasis></term>

--- a/doc/user/tutorial.xml
+++ b/doc/user/tutorial.xml
@@ -134,11 +134,11 @@
  Linking C executable tarantool_box
  [100%] Built target tarantool_box</programlisting>
  A complete instruction for building from source is located
-  in the source tree, file <filename xlink:href="https://github.com/mailru/tarantool/blob/master/README.md">README.md</filename>. There
+  in the source tree, file <filename xlink:href="https://github.com/tarantool/tarantool/blob/master/README.md">README.md</filename>. There
  are also specialized build instructions for
-  <productname xlink:href="https://github.com/mailru/tarantool/blob/master/README.CentOS">CetnOS</productname>,
-  <productname xlink:href="https://github.com/mailru/tarantool/blob/master/README.FreeBSD">FreeBSD</productname>,
-  <productname xlink:href="https://github.com/mailru/tarantool/blob/master/README.MacOSX">OS
+  <productname xlink:href="https://github.com/tarantool/tarantool/blob/master/README.CentOS">CetnOS</productname>,
+  <productname xlink:href="https://github.com/tarantool/tarantool/blob/master/README.FreeBSD">FreeBSD</productname>,
+  <productname xlink:href="https://github.com/tarantool/tarantool/blob/master/README.MacOSX">OS
  X</productname>.
 </para>
 <para>