Commits · dd8e556881bd8b7b4d88533b5b7c7dafcff027aa · ops / coco

26 Jan, 2018 9 commits
- Merged in test (pull request #16) · dd8e5568
  广宏伟 authored Jan 26, 2018
```
Test
```
  dd8e5568
- Merge branch 'dev' into test · ce31e68e
  ibuler authored Jan 26, 2018
  
  ce31e68e
- [Bugfix] For s3 debug · 619e01ca
  ibuler authored Jan 26, 2018
  
  619e01ca
- Merge branch 'dev' into test · f08ba199
  ibuler authored Jan 26, 2018
  
  f08ba199
- Merge branch 'test' of bitbucket.org:jumpserver/coco into test · 4b208944
  ibuler authored Jan 26, 2018
  
  4b208944
- [Bugfix] 修改docker_config · 3bc45cf6
  ibuler authored Jan 26, 2018
  
  3bc45cf6
- Merge branch 'dev' of bitbucket.org:jumpserver/coco into dev · 3636333c
  liuzheng712 authored Jan 26, 2018
  
  3636333c
- feat: update · 15b3b9c5
  liuzheng712 authored Jan 26, 2018
  
  15b3b9c5
- [Update] 修改一些缩进 · 203471d2
  ibuler authored Jan 26, 2018
  
  203471d2
25 Jan, 2018 31 commits
- Merged in test (pull request #15) · 14160462
  广宏伟 authored Jan 25, 2018
```
Test
```
  14160462
- Merge branch 'dev' into test · 5772ea4e
  liuzheng712 authored Jan 25, 2018
  
  5772ea4e
- [Merge] merge with dev · cb8f09b9
  ibuler authored Jan 25, 2018
  
  cb8f09b9
- feat: update · a3e6a236
  liuzheng712 authored Jan 25, 2018
  
  a3e6a236
- [Update] Merge with dev · d8e33ab8
  ibuler authored Jan 25, 2018
  
  d8e33ab8
- Merge branch 'dev' of bitbucket.org:jumpserver/coco into dev · 531025db
  ibuler authored Jan 25, 2018
  
  531025db
- [Update] 修改依赖sdk版本 · 999a4899
  ibuler authored Jan 25, 2018
  
  999a4899
- [Update] 修改utils,删掉不使用的函数 · 4829d8f5
  ibuler authored Jan 25, 2018
  
  4829d8f5
- feat: update the dockerfile · 7c39885d
  liuzheng712 authored Jan 25, 2018
  
  7c39885d
- Merge branch 'dev' into test · 51ea1d5c
  liuzheng712 authored Jan 25, 2018
  
  51ea1d5c
- fix: update · 75cca3cb
  liuzheng712 authored Jan 25, 2018
  
  75cca3cb
- merge dev · 4b9cbfa2
  liuzheng712 authored Jan 25, 2018
  
  4b9cbfa2
- fix: udpate · 66e74a7d
  liuzheng712 authored Jan 25, 2018
  
  66e74a7d
- merge dev · 1da674f6
  liuzheng712 authored Jan 25, 2018
  
  1da674f6
- fix: udpate · a624f51e
  liuzheng712 authored Jan 25, 2018
  
  a624f51e
- merge dev · 086e2893
  liuzheng712 authored Jan 25, 2018
  
  086e2893
- fix: update · 2bb32118
  liuzheng712 authored Jan 25, 2018
  
  2bb32118
- merge dev · bb8dfe98
  liuzheng712 authored Jan 25, 2018
  
  bb8dfe98
- feat: debug · 5091ffa5
  liuzheng712 authored Jan 25, 2018
  
  5091ffa5
- Merge branch 'dev' into test · e522b0d3
  liuzheng712 authored Jan 25, 2018
  
  e522b0d3
- fix: id to sid · f9a50751
  liuzheng712 authored Jan 25, 2018
  
  f9a50751
- Merge branch 'dev' into test · b68540a1
  liuzheng712 authored Jan 25, 2018
  
  b68540a1
- fix: · 12248fa3
  liuzheng712 authored Jan 25, 2018
```
update
```
  12248fa3
- Merged in dev (pull request #14) · 3615910a
  zheng liu authored Jan 25, 2018
```
Dev
```
  3615910a
- feat: update · 77bfcbd5
  liuzheng712 authored Jan 25, 2018
  
  77bfcbd5
- feat: update · 0c20d632
  liuzheng712 authored Jan 25, 2018
  
  0c20d632
- Merge branch 'test' of bitbucket.org:jumpserver/coco into test · 555b4571
  liuzheng712 authored Jan 25, 2018
  
  555b4571
- fix: · fd299fc2
  liuzheng712 authored Jan 25, 2018
```
update
```
  fd299fc2
- Merge branch 'test' of bitbucket.org:jumpserver/coco into test · a1f7e3a7
  ibuler authored Jan 25, 2018
  
  a1f7e3a7
- feat: update · 49d89ad7
  liuzheng712 authored Jan 25, 2018
  
  49d89ad7
- [Bugfix] catch exceptiton · f9b694d5
  ibuler authored Jan 25, 2018
  
  f9b694d5