| commit | 71120a921856d2daa778c6abf7850a7149176d0f | [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 | 1d14ff0b723f85bcb259f2140cd1ce586d27dc0f [diff] | |
| parent | 60aaba3806926176214894cd58e062b5ee0afe74 [diff] |
Merge branch 'master' of https://github.com/open-cloud/xos Conflicts: xos/core/models/service.py