[DRE-commits] [SCM] pkg-ruby-extras.git branch, master, updated. c6f57e09685b78fa4fd244c97c620726fa428d65

[Antonio Terceiro]

The following commit has been merged in the master branch:
commit c6f57e09685b78fa4fd244c97c620726fa428d65
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Sun Jun 24 17:16:43 2012 -0300

    update master repo

diff --git a/.gitignore b/.gitignore
index 81b2985..425a1f4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@ camping
 capistrano
 chef
 chef-server-api
+chef-solr
 coderay
 ctioga2
 cucumber
@@ -44,6 +45,9 @@ ruby-aggregate
 ruby-albino
 ruby-algorithm-diff
 ruby-amazon-ec2
+ruby-amq-client
+ruby-amq-protocol
+ruby-amqp
 ruby-amrita
 ruby-amrita2
 ruby-arel
@@ -104,6 +108,7 @@ ruby-facets
 ruby-fakefs
 ruby-fast-gettext
 ruby-fast-stemmer
+ruby-fast-xs
 ruby-fastercsv
 ruby-feedparser
 ruby-feedtools
@@ -274,6 +279,7 @@ ruby-ruby2ruby
 ruby-rubyforge
 ruby-rubymail
 ruby-rubytorrent
+ruby-sass-rails
 ruby-sdl
 ruby-sequel
 ruby-sequel-pg
@@ -335,6 +341,7 @@ ruby-yajl
 ruby-yard-sinatra
 ruby-zoom
 rubygems
+rubygems-integration
 samizdat
 shelr
 stompserver
diff --git a/.mrconfig b/.mrconfig
index 4793624..6b14f60 100644
--- a/.mrconfig
+++ b/.mrconfig
@@ -40,6 +40,9 @@ checkout = git_checkout chef
 [chef-server-api]
 checkout = git_checkout chef-server-api
 
+[chef-solr]
+checkout = git_checkout chef-solr
+
 [coderay]
 checkout = git_checkout coderay
 
@@ -154,6 +157,15 @@ checkout = git_checkout ruby-algorithm-diff
 [ruby-amazon-ec2]
 checkout = git_checkout ruby-amazon-ec2
 
+[ruby-amq-client]
+checkout = git_checkout ruby-amq-client
+
+[ruby-amq-protocol]
+checkout = git_checkout ruby-amq-protocol
+
+[ruby-amqp]
+checkout = git_checkout ruby-amqp
+
 [ruby-amrita]
 checkout = git_checkout ruby-amrita
 
@@ -334,6 +346,9 @@ checkout = git_checkout ruby-fast-gettext
 [ruby-fast-stemmer]
 checkout = git_checkout ruby-fast-stemmer
 
+[ruby-fast-xs]
+checkout = git_checkout ruby-fast-xs
+
 [ruby-fastercsv]
 checkout = git_checkout ruby-fastercsv
 
@@ -844,6 +859,9 @@ checkout = git_checkout ruby-rubymail
 [ruby-rubytorrent]
 checkout = git_checkout ruby-rubytorrent
 
+[ruby-sass-rails]
+checkout = git_checkout ruby-sass-rails
+
 [ruby-sdl]
 checkout = git_checkout ruby-sdl
 
@@ -1027,6 +1045,9 @@ checkout = git_checkout ruby-zoom
 [rubygems]
 checkout = git_checkout rubygems
 
+[rubygems-integration]
+checkout = git_checkout rubygems-integration
+
 [samizdat]
 checkout = git_checkout samizdat
 

-- 
pkg-ruby-extras.git