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

.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

ext/lxc/lxc.c

@@ -440,6 +440,15 @@ container_running_p(VALUE self)
  *   container.state
  *
  * Returns a symbol representing the state of the container.
+ *
+ * * +:stopped+
+ * * +:starting+
+ * * +:running+
+ * * +:stopping+
+ * * +:aborting+
+ * * +:freezing+
+ * * +:frozen+
+ * * +:thawed+
  */
 static VALUE
 container_state(VALUE self)
@@ -1277,6 +1286,10 @@ container_config_path(VALUE self)
  *   container.keys(key)
  *
  * Returns a list of valid sub-keys for the given configuration key.
+ *
+ * Keys can be in the format 'lxc.network.<idx>', (eg. 'lxc.network.0',
+ * 'lxc.network.1'). The result shows which keys are valid according to
+ * type of network interface.
  */
 static VALUE
 container_keys(VALUE self, VALUE rb_key)

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'