修改cheat文件
Change-Id: I0ffce820f7ff78b6fe5b9a714baf17814636dc19
API修改
Change-Id: I63a5b9752afcfe6f8088d2cfc065b385ee2a4464
merge
Change-Id: I783bc0349b858b16bccd1ec21623182239170df2
修改cheat文件
Change-Id: I0ffce820f7ff78b6fe5b9a714baf17814636dc19
merge
Change-Id: I783bc0349b858b16bccd1ec21623182239170df2
修改cheat文件
Change-Id: I0ffce820f7ff78b6fe5b9a714baf17814636dc19
merge
Change-Id: I783bc0349b858b16bccd1ec21623182239170df2
合并API代码
Change-Id: I5ac299271c14d247413d78b5da51adc28977e05d
diff --git a/et --hard b0d52b6 b/et --hard b0d52b6
new file mode 100644
index 0000000..5dacbbe
--- /dev/null
+++ b/et --hard b0d52b6
@@ -0,0 +1,58 @@
+[33m9afbc55[m[33m ([m[1;36mHEAD[m[33m -> [m[1;32mmaster[m[33m)[m HEAD@{0}: pull --rebase (finish): returning to refs/heads/master
+[33m9afbc55[m[33m ([m[1;36mHEAD[m[33m -> [m[1;32mmaster[m[33m)[m HEAD@{1}: pull --rebase (pick): 修改cheat文件
+[33me8716ad[m[33m ([m[1;31morigin/master[m[33m, [m[1;31morigin/HEAD[m[33m)[m HEAD@{2}: pull --rebase (start): checkout e8716ada9fc18154108495d7c389b7fc0f269580
+[33mb0d52b6[m HEAD@{3}: commit (amend): 修改cheat文件
+[33m34caf7d[m HEAD@{4}: commit: 修改cheat文件
+[33m720e94e[m HEAD@{5}: commit (amend): Api修改暂存
+[33mba2cb98[m HEAD@{6}: pull: Fast-forward
+[33m26f66f5[m HEAD@{7}: pull: Fast-forward
+[33m7dc11a2[m HEAD@{8}: pull: Fast-forward
+[33mc69af0a[m HEAD@{9}: pull: Fast-forward
+[33medf430a[m HEAD@{10}: commit: 修复testGetAppealList函数
+[33m5ba779f[m HEAD@{11}: commit (amend): Cheat接口部分实现及测试代码
+[33m7a0803a[m HEAD@{12}: commit (amend): 函数拼写矫正&接口修改
+[33md4167c1[m HEAD@{13}: reset: moving to HEAD~1
+[33m56e3ca5[m HEAD@{14}: commit (amend): Cheat接口部分实现及测试代码
+[33m66c7797[m HEAD@{15}: commit (amend): 函数拼写矫正&接口修改
+[33m90f3d5d[m HEAD@{16}: reset: moving to HEAD~1
+[33m99eaef3[m HEAD@{17}: commit (amend): Cheat部分函数实现及测试代码
+[33m1775145[m HEAD@{18}: commit (amend): Cheat System部分功能实现及单元测试代码
+[33m80a7003[m HEAD@{19}: rebase (finish): returning to refs/heads/master
+[33m80a7003[m HEAD@{20}: commit (amend): CheatSystem开发
+[33m2a7ca56[m HEAD@{21}: pull --rebase (pick): Cheat接口改动
+[33m90f3d5d[m HEAD@{22}: pull --rebase (pick): 函数拼写矫正&接口修改
+[33md4167c1[m HEAD@{23}: pull --rebase (pick): 函数拼写矫正&接口修改
+[33m33a7d95[m HEAD@{24}: pull --rebase (start): checkout 33a7d95241577b2720875014004e0e9a1178e2a5
+[33md7dec5f[m HEAD@{25}: commit: CheatSystem开发
+[33ma9594e4[m HEAD@{26}: reset: moving to HEAD
+[33ma9594e4[m HEAD@{27}: rebase (finish): returning to refs/heads/master
+[33ma9594e4[m HEAD@{28}: rebase (pick): Cheat接口改动
+[33mb413180[m HEAD@{29}: rebase (continue): 函数拼写矫正&接口修改
+[33m21e8079[m HEAD@{30}: rebase (continue): 函数拼写矫正&接口修改
+[33mf35409f[m HEAD@{31}: pull --rebase (start): checkout f35409f7212fe81f9f656d45cd305bbf2207f92f
+[33mb97358d[m HEAD@{32}: commit (amend): 本地冲突暂存
+[33maa78bae[m HEAD@{33}: merge refs/remotes/origin/master: Merge made by the 'ort' strategy.
+[33m8b4f838[m HEAD@{34}: commit: Cheat接口改动
+[33m6f65699[m HEAD@{35}: commit: 函数拼写矫正&接口修改
+[33mc9d0644[m HEAD@{36}: commit (amend): 函数拼写矫正&接口修改
+[33m9b70bb3[m HEAD@{37}: commit: 改动Cheat接口
+[33m57f2bac[m HEAD@{38}: pull: Fast-forward
+[33m1d888e1[m HEAD@{39}: pull: Fast-forward
+[33ma912512[m HEAD@{40}: pull: Fast-forward
+[33ma8babc6[m HEAD@{41}: commit (merge): 处理冲突
+[33m0e21c14[m HEAD@{42}: commit: 处理更新
+[33m53e52fc[m HEAD@{43}: commit (amend): 更新API文档 by Raver
+[33mc5deb8f[m HEAD@{44}: commit (amend): 更新API文档 by Raver
+[33mbe6e3e1[m HEAD@{45}: commit: 更新API文档 by Raver
+[33mac1a633[m HEAD@{46}: pull: Fast-forward
+[33mb10834c[m HEAD@{47}: pull: Fast-forward
+[33maa249ae[m HEAD@{48}: pull: Fast-forward
+[33m1b9b88e[m HEAD@{49}: pull: Fast-forward
+[33m30e7379[m HEAD@{50}: pull: Fast-forward
+[33m5663419[m HEAD@{51}: commit (amend): Hello by Raver
+[33mf593971[m HEAD@{52}: commit: Hello by Raver
+[33mbab2b5c[m HEAD@{53}: pull: Fast-forward
+[33mfd27075[m[33m ([m[1;31morigin/Raver[m[33m)[m HEAD@{54}: checkout: moving from Raver to master
+[33maf22949[m[33m ([m[1;32mRaver[m[33m)[m HEAD@{55}: commit: Add user_torrent_stats table creation script
+[33mfd27075[m[33m ([m[1;31morigin/Raver[m[33m)[m HEAD@{56}: checkout: moving from master to Raver
+[33mfd27075[m[33m ([m[1;31morigin/Raver[m[33m)[m HEAD@{57}: clone: from ssh://gerrit.lilingkun.com:29418/G10-PT-TRM