| commit | fdddc8f6535bbd3530c7e72326988d968309588a | [log] [tgz] |
|---|---|---|
| author | James E. Blair <jeblair@openstack.org> | Thu Jun 13 16:03:01 2013 -0700 |
| committer | James E. Blair <jeblair@openstack.org> | Thu Jun 13 16:03:06 2013 -0700 |
| tree | dc8ab784aceeebade3f045386eb568e2e302833c | |
| parent | 869b12acb69d90bce9f7e72e0e4052fc2656f003 [diff] | |
| parent | d6d2a64c9e9f74b68562cd12544a23f202a77a67 [diff] |
Merge branch 'master' into feature/gearman Change-Id: I0b6d513aaa2536f01bcd4475d843bb93de69c7e0