[DRE-commits] [ruby-grack] 02/10: Merge branch 'upstream'

[Antonio Terceiro]

This is an automated email from the git hooks/post-receive script.

terceiro pushed a commit to branch master
in repository ruby-grack.

commit 9079f8c4afff0126c5f4b7cdf8cbcd94c7761b25
Merge: ed0b734 2ceb6d8
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Fri Sep 4 10:50:52 2015 -0300

    Merge branch 'upstream'

 .gitignore           |   2 +
 .travis.yml          |  14 ++++
 CHANGELOG            |  16 +++++
 Gemfile              |   9 +++
 Gemfile.lock         |  33 ++++++++++
 README.md            |   4 ++
 Rakefile             |   2 +-
 bin/console          |   6 ++
 bin/testserver       |  14 ++++
 grack.gemspec        |   4 +-
 lib/grack/git.rb     |  72 +++++++++++++++++++++
 lib/grack/server.rb  | 178 ++++++++++++++++++++++++++-------------------------
 lib/grack/version.rb |   2 +-
 metadata.yml         |  91 --------------------------
 tests/main_test.rb   |  47 +++++++++++---
 15 files changed, 302 insertions(+), 192 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-grack.git