resolve conflicts

.travis.yml

@@ -4,7 +4,7 @@ go:
   - 1.7
 
 install:
-  - ./install.sh
+  - go get -t ./...
   - go get golang.org/x/tools/cmd/cover
   - go get github.com/mattn/goveralls
 

AUTHORS

@@ -0,0 +1,19 @@
+Authors sorted by their family-name.
+
+# Directly affiliated with EPFL/DEDIS
+
+Patricia Egger <patricia.egger@epfl.ch>
+Bryan Ford <bryan.ford@epfl.ch>
+David Froelicher <david.froelicher@epfl.ch>
+Nikitin Kirill <kirill.nikitin@epfl.ch>
+Kokoris Kogias Eleftherios <eleftherios.kokoriskogias@epfl.ch>
+Ismail Khoffi <ismail.khoffi@epfl.ch>
+Nicolas Gailly <nicolas.gailly@epfl.ch>
+Linus Gasser <linus.gasser@epfl.ch>
+Philipp Jovanovic <philipp.Jovanovic@epfl.ch>
+
+# NON-EPFL/DEDIS - signed a CLA / CLAI:
+
+Christian Mouchet <christian.mouchet@epfl.ch>
+Evan Visher <evan.visher@gmail.com>
+Mahdi Zamani <mahdi.zamani@yale.edu>

CLAC

@@ -0,0 +1,157 @@
+                       EPFL / DEDIS / Lausanne / CH
+  Software Grant and Corporate Contributor License Agreement ("Agreement")
+                      http://www.apache.org/licenses/
+
+   Thank you for your interest in software from EPFL/DEDIS (Lab).
+   In order to clarify the intellectual property license
+   granted with Contributions from any person or entity, the Lab
+   must have a Contributor License Agreement (CLA) on file that has been
+   signed by each Contributor, indicating agreement to the license terms
+   below. This license is for your protection as a Contributor as well
+   as the protection of the Lab and its users; it does not change
+   your rights to use your own Contributions for any other purpose.
+
+   This version of the Agreement allows an entity (the "Corporation") to
+   submit Contributions to the Lab, to authorize Contributions 
+   submitted by its designated employees to the Lab, and to grant 
+   copyright and patent licenses thereto.
+
+   If you have not already done so, please complete and sign, then scan and
+   email a pdf file of this Agreement to bryan.ford@epfl.ch.
+   Alternatively, you may send it by facsimile to the Lab at
+   +41 21 693 66 10. If necessary, send an original signed Agreement to
+   EPFL-IC-DEDIS, BC Building, Station 14, CH-1015 Lausanne,
+   SWITZERLAND.
+   Please read this document carefully before signing and keep a copy for
+   your records.
+
+   Corporation name:    ________________________________________________
+
+   Corporation address: ________________________________________________
+
+                        ________________________________________________
+
+                        ________________________________________________
+
+   Point of Contact:    ________________________________________________
+
+          E-Mail:       ________________________________________________
+
+          Telephone:    _____________________ Fax: _____________________
+
+
+   You accept and agree to the following terms and conditions for Your
+   present and future Contributions submitted to the Lab. In
+   return, the Lab shall not use Your Contributions in a way that
+   is contrary to the public benefit or inconsistent with its nonprofit
+   status and bylaws in effect at the time of the Contribution. Except
+   for the license granted herein to the Lab and recipients of
+   software distributed by the Lab, You reserve all right, title,
+   and interest in and to Your Contributions.
+
+   1. Definitions.
+
+      "You" (or "Your") shall mean the copyright owner or legal entity
+      authorized by the copyright owner that is making this Agreement
+      with the Lab. For legal entities, the entity making a
+      Contribution and all other entities that control, are controlled by,
+      or are under common control with that entity are considered to be a
+      single Contributor. For the purposes of this definition, "control"
+      means (i) the power, direct or indirect, to cause the direction or
+      management of such entity, whether by contract or otherwise, or
+      (ii) ownership of fifty percent (50%) or more of the outstanding
+      shares, or (iii) beneficial ownership of such entity.
+
+      "Contribution" shall mean the code, documentation or other original
+      works of authorship expressly identified in Schedule B, as well as
+      any original work of authorship, including
+      any modifications or additions to an existing work, that is intentionally
+      submitted by You to the Lab for inclusion in, or
+      documentation of, any of the products owned or managed by the
+      Lab (the "Work"). For the purposes of this definition,
+      "submitted" means any form of electronic, verbal, or written
+      communication sent to the Lab or its representatives,
+      including but not limited to communication on electronic mailing
+      lists, source code control systems, and issue tracking systems
+      that are managed by, or on behalf of, the Lab for the
+      purpose of discussing and improving the Work, but excluding
+      communication that is conspicuously marked or otherwise designated
+      in writing by You as "Not a Contribution."
+
+   2. Grant of Copyright License. Subject to the terms and conditions
+      of this Agreement, You hereby grant to the Lab and to
+      recipients of software distributed by the Lab a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare derivative works of,
+      publicly display, publicly perform, sublicense, and distribute
+      Your Contributions and such derivative works.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this Agreement, You hereby grant to the Lab and to recipients
+      of software distributed by the Lab a perpetual, worldwide,
+      non-exclusive, no-charge, royalty-free, irrevocable (except as
+      stated in this section) patent license to make, have made, use,
+      offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by You that are necessarily infringed by Your Contribution(s)
+      alone or by combination of Your Contribution(s) with the Work to
+      which such Contribution(s) were submitted. If any entity institutes
+      patent litigation against You or any other entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that your
+      Contribution, or the Work to which you have contributed, constitutes
+      direct or contributory patent infringement, then any patent licenses
+      granted to that entity under this Agreement for that Contribution or
+      Work shall terminate as of the date such litigation is filed.
+
+   4. You represent that You are legally entitled to grant the above
+      license. You represent further that each employee of the
+      Corporation designated on Schedule A below (or in a subsequent
+      written modification to that Schedule) is authorized to submit
+      Contributions on behalf of the Corporation.
+
+   5. You represent that each of Your Contributions is Your original
+      creation (see section 7 for submissions on behalf of others).
+
+   6. You are not expected to provide support for Your Contributions,
+      except to the extent You desire to provide support. You may provide
+      support for free, for a fee, or not at all. Unless required by
+      applicable law or agreed to in writing, You provide Your
+      Contributions on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
+      OF ANY KIND, either express or implied, including, without
+      limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT,
+      MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE.
+
+   7. Should You wish to submit work that is not Your original creation,
+      You may submit it to the Lab separately from any
+      Contribution, identifying the complete details of its source and
+      of any license or other restriction (including, but not limited
+      to, related patents, trademarks, and license agreements) of which
+      you are personally aware, and conspicuously marking the work as
+      "Submitted on behalf of a third-party: [named here]".
+
+   8. It is your responsibility to notify the Lab when any change
+      is required to the list of designated employees authorized to submit
+      Contributions on behalf of the Corporation, or to the Corporation's
+      Point of Contact with the Lab.
+
+
+
+   Please sign: __________________________________ Date: _______________
+
+   Title:       __________________________________
+
+   Corporation: __________________________________
+
+
+Schedule A
+
+   [Initial list of designated employees.  NB: authorization is not
+    tied to particular Contributions.]
+
+
+
+
+Schedule B
+
+   [Identification of optional concurrent software grant.  Would be
+    left blank or omitted if there is no concurrent software grant.]

CLAI

@@ -0,0 +1,136 @@
+                    EPFL / DEDIS / Lausanne / CH
+     Individual Contributor License Agreement ("Agreement") V2.0
+                   http://www.apache.org/licenses/
+
+Thank you for your interest in software from EPFL/DEDIS (Lab).
+In order to clarify the intellectual property license
+granted with Contributions from any person or entity, the Lab
+must have a Contributor License Agreement ("CLA") on file that has
+been signed by each Contributor, indicating agreement to the license
+terms below. This license is for your protection as a Contributor as
+well as the protection of the Lab and its users; it does not
+change your rights to use your own Contributions for any other purpose.
+If you have not already done so, please complete and sign, then scan
+and email a pdf file of this Agreement to bryan.ford@epfl.ch.
+Alternatively, you may send it by facsimile to the Lab at
++41 21 693 66 10. If necessary, send an original signed Agreement to
+EPFL-IC-DEDIS, BC Building, Station 14, CH-1015 Lausanne,
+SWITZERLAND. Please read this document carefully before
+signing and keep a copy for your records.
+
+  Full name: ______________________________________________________
+
+  (optional) Public name: _________________________________________
+
+  Mailing Address: ________________________________________________
+
+                   ________________________________________________
+
+  Country:   ______________________________________________________
+
+  Telephone: ______________________________________________________
+
+  E-Mail:    ______________________________________________________
+
+  Github account: _________________________________________________
+
+You accept and agree to the following terms and conditions for Your
+present and future Contributions submitted to the Lab. In
+return, the Lab shall not use Your Contributions in a way that
+is contrary to the public benefit or inconsistent with its nonprofit
+status and bylaws in effect at the time of the Contribution. Except
+for the license granted herein to the Lab and recipients of
+software distributed by the Lab, You reserve all right, title,
+and interest in and to Your Contributions.
+
+1. Definitions.
+
+   "You" (or "Your") shall mean the copyright owner or legal entity
+   authorized by the copyright owner that is making this Agreement
+   with the Lab. For legal entities, the entity making a
+   Contribution and all other entities that control, are controlled
+   by, or are under common control with that entity are considered to
+   be a single Contributor. For the purposes of this definition,
+   "control" means (i) the power, direct or indirect, to cause the
+   direction or management of such entity, whether by contract or
+   otherwise, or (ii) ownership of fifty percent (50%) or more of the
+   outstanding shares, or (iii) beneficial ownership of such entity.
+
+   "Contribution" shall mean any original work of authorship,
+   including any modifications or additions to an existing work, that
+   is intentionally submitted by You to the Lab for inclusion
+   in, or documentation of, any of the products owned or managed by
+   the Lab (the "Work"). For the purposes of this definition,
+   "submitted" means any form of electronic, verbal, or written
+   communication sent to the Lab or its representatives,
+   including but not limited to communication on electronic mailing
+   lists, source code control systems, and issue tracking systems that
+   are managed by, or on behalf of, the Lab for the purpose of
+   discussing and improving the Work, but excluding communication that
+   is conspicuously marked or otherwise designated in writing by You
+   as "Not a Contribution."
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+   this Agreement, You hereby grant to the Lab and to
+   recipients of software distributed by the Lab a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   copyright license to reproduce, prepare derivative works of,
+   publicly display, publicly perform, sublicense, and distribute Your
+   Contributions and such derivative works.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+   this Agreement, You hereby grant to the Lab and to
+   recipients of software distributed by the Lab a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   (except as stated in this section) patent license to make, have
+   made, use, offer to sell, sell, import, and otherwise transfer the
+   Work, where such license applies only to those patent claims
+   licensable by You that are necessarily infringed by Your
+   Contribution(s) alone or by combination of Your Contribution(s)
+   with the Work to which such Contribution(s) was submitted. If any
+   entity institutes patent litigation against You or any other entity
+   (including a cross-claim or counterclaim in a lawsuit) alleging
+   that your Contribution, or the Work to which you have contributed,
+   constitutes direct or contributory patent infringement, then any
+   patent licenses granted to that entity under this Agreement for
+   that Contribution or Work shall terminate as of the date such
+   litigation is filed.
+
+4. You represent that you are legally entitled to grant the above
+   license. If your employer(s) has rights to intellectual property
+   that you create that includes your Contributions, you represent
+   that you have received permission to make Contributions on behalf
+   of that employer, that your employer has waived such rights for
+   your Contributions to the Lab, or that your employer has
+   executed a separate Corporate CLA with the Lab.
+
+5. You represent that each of Your Contributions is Your original
+   creation (see section 7 for submissions on behalf of others).  You
+   represent that Your Contribution submissions include complete
+   details of any third-party license or other restriction (including,
+   but not limited to, related patents and trademarks) of which you
+   are personally aware and which are associated with any part of Your
+   Contributions.
+
+6. You are not expected to provide support for Your Contributions,
+   except to the extent You desire to provide support. You may provide
+   support for free, for a fee, or not at all. Unless required by
+   applicable law or agreed to in writing, You provide Your
+   Contributions on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
+   OF ANY KIND, either express or implied, including, without
+   limitation, any warranties or conditions of TITLE, NON-
+   INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE.
+
+7. Should You wish to submit work that is not Your original creation,
+   You may submit it to the Lab separately from any
+   Contribution, identifying the complete details of its source and of
+   any license or other restriction (including, but not limited to,
+   related patents, trademarks, and license agreements) of which you
+   are personally aware, and conspicuously marking the work as
+   "Submitted on behalf of a third-party: [named here]".
+
+8. You agree to notify the Lab of any facts or circumstances of
+   which you become aware that would make these representations
+   inaccurate in any respect.
+
+Please sign: __________________________________ Date: ________________

CONTRIBUTION

@@ -0,0 +1,26 @@
+Making Contributions
+
+Cothority is an Open Source program with many contributors (listed in the AUTHORS
+files), so we actively seek contributions (help on the Cothority users list,
+documentation, source code, ideas, …).  All contributions help us make a
+better product.
+
+All contributions without an explicit copyright statement or a CLAI/CLAC (see below)
+are assumed to be covered under a AGPL 2-Clause license as described in the
+file LICENSE.
+
+Developers who have contributed significant changes to the Cothority code must sign
+a Contributor License Agreement (CLAI), eventually also a CLAC if they work for
+a corporation. Together they guarantee them the right to use the code they have
+developed, and also ensures that EPFL/DEDIS (and thus the Cothority project) has the
+rights to the code.
+By signing the CLAI/CLAC, your contributions are eligible to be integrated into the
+Cothority source code.
+Having the CLAI/CLAC signed is essential for the Cothority project to maintain a
+clean copyright and guarantees that Cothority and your source code will always remain
+Free Software (Open Source).
+Providing that your contribution is accepted by the Cothority project, your signed
+CLAI/CLAC also permits EPFL/DEDIS to submit your contribution for use in other
+EPFL/DEDIS-projects.
+
+The Contributor License Agreements are in the CLAI and CLAC-file.