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

[Paul van Tilburg]

The following commit has been merged in the master branch:
commit 99da81995f74378013444d9553df45ed5e93b8aa
Author: Paul van Tilburg <paulvt at debian.org>
Date:   Tue Jun 19 21:14:21 2012 +0200

    Update master repository

diff --git a/.gitignore b/.gitignore
index 30833c6..81b2985 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@ bundler
 camping
 capistrano
 chef
+chef-server-api
 coderay
 ctioga2
 cucumber
@@ -133,6 +134,8 @@ ruby-gruff
 ruby-gsl
 ruby-haml
 ruby-heckle
+ruby-hiera
+ruby-hiera-puppet
 ruby-highline
 ruby-hike
 ruby-hikidoc
@@ -141,6 +144,7 @@ ruby-hoe
 ruby-hpricot
 ruby-htmlentities
 ruby-http-connection
+ruby-http-parser
 ruby-httpclient
 ruby-i18n
 ruby-ihelp
diff --git a/.mrconfig b/.mrconfig
index 14266b4..4793624 100644
--- a/.mrconfig
+++ b/.mrconfig
@@ -37,6 +37,9 @@ checkout = git_checkout capistrano
 [chef]
 checkout = git_checkout chef
 
+[chef-server-api]
+checkout = git_checkout chef-server-api
+
 [coderay]
 checkout = git_checkout coderay
 
@@ -421,6 +424,12 @@ checkout = git_checkout ruby-haml
 [ruby-heckle]
 checkout = git_checkout ruby-heckle
 
+[ruby-hiera]
+checkout = git_checkout ruby-hiera
+
+[ruby-hiera-puppet]
+checkout = git_checkout ruby-hiera-puppet
+
 [ruby-highline]
 checkout = git_checkout ruby-highline
 
@@ -445,6 +454,9 @@ checkout = git_checkout ruby-htmlentities
 [ruby-http-connection]
 checkout = git_checkout ruby-http-connection
 
+[ruby-http-parser]
+checkout = git_checkout ruby-http-parser
+
 [ruby-httpclient]
 checkout = git_checkout ruby-httpclient
 

-- 
pkg-ruby-extras.git