Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Update sidekiq licensing to avoid GPL incompatibilities

  • Loading branch information...
commit 4c1a859d181fd543b3b288fba5a3de896a37612d 1 parent 2d42f3d
@mperham mperham authored
Showing with 12 additions and 11 deletions.
  1. +11 −4 LICENSE
  2. +1 −7 README.md
View
15 LICENSE
@@ -1,9 +1,16 @@
Copyright (c) Mike Perham
-Sidekiq is open source licensed under the GPLv3 for non-commerical use:
+You may choose to license Sidekiq in one of two ways:
+
+- Open Source under the GPLv3
Please see <http://www.gnu.org/licenses/gpl-3.0.html> for license text.
-To purchase a commercial license, you must pledge $50 to my Pledgie
-fund at http://www.pledgie.com/campaigns/16623. The commercial license can
-be found in COMM-LICENSE.
+- Commercial License
+
+ The Sencha commercial software license in COMM-LICENSE. You must pledge
+ $50 to my Pledgie fund at http://www.pledgie.com/campaigns/16623 to use
+ this license.
+
+This commercial license is just meant to help support my OSS work. If
+you do buy the commercial licensing option, thank you for your support!
View
8 README.md
@@ -47,13 +47,7 @@ Please see the [sidekiq wiki](https://github.com/mperham/sidekiq/wiki) for more
License
-----------------
-sidekiq is GPLv3 licensed for **non-commercial use only**. For a commercial
-license, you must give $50 to my [Pledgie campaign](http://www.pledgie.com/campaigns/16623).
-Considering the hundreds of hours I've spent writing OSS, I hope you
-think this is a reasonable price. BTW, the commercial license is in
-COMM-LICENSE and is the [Sencha commercial license v1.10](http://www.sencha.com/legal/sencha-commercial-software-license-agreement/) with the Support (section 11) terms removed.
-Support is provided through GitHub Issues. You are welcome to try the
-software for 2 weeks.
+Please see LICENSE for licensing details.
<a href='http://www.pledgie.com/campaigns/16623'><img alt='Click here to lend your support to Open Source and make a donation at www.pledgie.com !' src='http://www.pledgie.com/campaigns/16623.png?skin_name=chrome' border='0' /></a>
Please sign in to comment.
Something went wrong with that request. Please try again.