| commit | 3406fbb0913f1a5caebcd7e6143fbd44d94fbfca | [log] [tgz] |
|---|---|---|
| author | Srikanth Vavilapalli <srikanth.vavilapalli@ericsson.com> | Tue Nov 17 13:41:38 2015 -0600 |
| committer | Srikanth Vavilapalli <srikanth.vavilapalli@ericsson.com> | Tue Nov 17 13:41:38 2015 -0600 |
| tree | 4274f3ca8a5beed4a6c559deeb265aef836df47b | |
| parent | 17b5a3ccfb725fa8f19d8b1e04043617d2d80ae0 [diff] | |
| parent | 88fba407ab0a458f1103054101647ad77e362f91 [diff] |
Merge branch 'master' of https://github.com/open-cloud/xos Conflicts: xos/core/models/service.py