Permalink
Browse files

Updated the license file

  • Loading branch information...
dvanaken committed Feb 17, 2015
1 parent 6f870a7 commit d7378333710fb4d0bf04b973f7c7e9d7e7031750
Showing with 12 additions and 17 deletions.
  1. +12 −17 LICENSE
View
29 LICENSE
@@ -1,18 +1,13 @@
oltpbenchmark.com
Project Info: http://oltpbenchmark.com
Project Members:
Carlo Curino <carlo.curino@gmail.com>
Evan Jones <ej@evanjones.ca>
DIFALLAH Djellel Eddine <djelleleddine.difallah@unifr.ch>
Andy Pavlo <pavlo@cs.brown.edu>
CUDRE-MAUROUX Philippe <philippe.cudre-mauroux@unifr.ch>
Yang Zhang <yaaang@gmail.com>
This library is free software; you can redistribute it and/or modify it under the terms
of the GNU General Public License as published by the Free Software Foundation;
either version 3.0 of the License, or (at your option) any later version.
Copyright 2015 by OLTPBenchmark Project
This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the GNU Lesser General Public License for more details.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.

0 comments on commit d737833

Please sign in to comment.