Merge branch 'NiR--1.1.x' into 1.1.x

Merge branch '1.1.x' of https://github.com/NiR-/ruby-lxc into NiR--1.1.x
Adding rdoc dependencies for ruby 1.8
2014-06-10 15:56:59 -03:00 · 2014-06-10 15:56:44 -03:00 · 2014-06-09 22:34:58 +02:00 · 2014-06-09 18:17:55 +02:00
2 changed files with 4 additions and 3 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -5,12 +5,11 @@ rvm:
  - 2.1.0
 branches:
  only:
-    - master
+    - 1.1.x
 before_install:
  - sudo apt-get update -y
  - sudo apt-get install -y python-software-properties
-  - sudo add-apt-repository -y ppa:ubuntu-lxc/daily
  - sudo apt-get update -y
-  - sudo apt-get install -y liblxc0 lxc lxc-dbg lxc-dev lxc-templates lxc-tests lxctl python3-lxc
+  - sudo apt-get install -y liblxc0
 script:
  - bundle exec rake clean package
--- a/ruby-lxc.gemspec
+++ b/ruby-lxc.gemspec
@ -13,6 +13,8 @@ Gem::Specification.new do |s|
  s.extensions = 'ext/lxc/extconf.rb'
  s.has_rdoc   = true

+  s.add_development_dependency "rdoc"
+  s.add_development_dependency "rdoc-data"
  s.add_development_dependency "rake-compiler"

  s.homepage    = 'https://github.com/lxc/ruby-lxc'
Author	SHA1	Message	Date
Andre Nathan	be2102ac82	Merge branch 'NiR--1.1.x' into 1.1.x	2014-06-10 15:56:59 -03:00
Andre Nathan	ff222817e4	Merge branch '1.1.x' of https://github.com/NiR-/ruby-lxc into NiR--1.1.x	2014-06-10 15:56:44 -03:00
NiR-	89082e1db1	Adding rdoc dependencies for ruby 1.8	2014-06-09 22:34:58 +02:00
NiR-	cc8d829d9b	Removing lxc daily ppa from travis build for ensuring that the ubuntu package is used.	2014-06-09 18:17:55 +02:00