Permalink
Browse files

merge

  • Loading branch information...
2 parents f8ed527 + e8e4c26 commit 20c14df1e63b42cb06897506655267f23f5c7bfe @derekcollison derekcollison committed Mar 12, 2011
Showing with 5 additions and 4 deletions.
  1. +2 −2 COPYING
  2. +1 −1 TODO
  3. +2 −1 nats.gemspec
View
@@ -1,4 +1,4 @@
-Copyright (c) 2010,2011 Derek Collison <derek.collison@gmail.com>. All rights reserved.
+Copyright (c) 2010, 2011 Derek Collison <derek.collison@gmail.com>. All rights reserved.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to
@@ -16,4 +16,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-IN THE SOFTWARE.
+IN THE SOFTWARE.
View
2 TODO
@@ -1,5 +1,5 @@
-- clustering/routing
+- *clustering/routing*
- balance receive perf with send perf
- do client blowup detection from sending in tight loop
View
@@ -3,7 +3,7 @@
lib = File.expand_path('../lib/', __FILE__)
$:.unshift lib unless $:.include?(lib)
-require 'nats/server/const.rb'
+require 'nats/server/const'
spec = Gem::Specification.new do |s|
s.name = 'nats'
@@ -27,6 +27,7 @@ spec = Gem::Specification.new do |s|
s.files = %w[
COPYING
README.md
+ ChangeLog
nats.gemspec
Rakefile
bin/nats-server

0 comments on commit 20c14df

Please sign in to comment.