From 13601fe31a1f5a623bf4e34309039a27abf582af Mon Sep 17 00:00:00 2001
From: LSZ <zhao@idsmanager.com>
Date: Tue, 25 Oct 2016 11:32:17 +0800
Subject: [PATCH] #295: Merge remote-tracking branch 'origin/master'

---
 commit.ref |  2 +-
 commit.yml | 52 +++++-----------------------------------------------
 2 files changed, 6 insertions(+), 48 deletions(-)

diff --git a/commit.ref b/commit.ref
index 0284d81..2cbf4bc 160000
--- a/commit.ref
+++ b/commit.ref
@@ -1 +1 @@
-Subproject commit 0284d8182740b6c21f686e461c05638860513632
+Subproject commit 2cbf4bc3aee114caada64e2eca1ebe1a81f7617b
diff --git a/commit.yml b/commit.yml
index b41dd58..91c43ac 100644
--- a/commit.yml
+++ b/commit.yml
@@ -2,52 +2,10 @@
 branches: {
   }
 fileChange:
-  /pom.xml:
-    newFile: !uuid '8fbde19692381a386eb9b9071d0e6319dab38dac'
-    oldFile: !uuid 'df14fe9425b7c1d210627cf234fd9c1388c4e288'
-  /src:
-    newFile: !uuid 'bc76d30071fc8d0f4425f28e58489ce019733c5b'
-    oldFile: !uuid '768a6cc60df974cb8dfebb98417366cecfc4ab43'
-  /src/main:
-    newFile: !uuid '29fbda4e210312a61204a7812db58198466343b4'
-    oldFile: !uuid 'baad3bc7f4215d7dce2df170b8ed806c500c1ee0'
-  /src/main/java:
-    newFile: !uuid 'd2ea876b10ec2b6430eb3e139aed966eb011a9ef'
-    oldFile: !uuid '1c98d122ae1ce250632850f6d451d9b2b796e06f'
-  /src/main/java/com:
-    newFile: !uuid 'd625e841b4918772f0f6849ed5b9511cfe4f056a'
-    oldFile: !uuid 'a7969b2da6868a2cfd26a010ec2b8b549b66d6ed'
-  /src/main/java/com/monkeyk:
-    newFile: !uuid '438c2a20d52cb0f6d16428aaa4691b2ae86bf4a7'
-    oldFile: !uuid '396b9eb12d5b23150a68cb8ced6a359acb8c8350'
-  /src/main/java/com/monkeyk/sos:
-    newFile: !uuid '3df82ab7ae3244c858f558a5c68aee1f42042039'
-    oldFile: !uuid '2048c09854a9e2b6453e9bfd140bb4e0bd5d1e80'
-  /src/main/java/com/monkeyk/sos/infrastructure:
-    newFile: !uuid 'a2e06e66d19f7d13c04f6710847f88bd77a28d00'
-    oldFile: !uuid '4b72af2262d7f391fc6042d03ce9ef730ec2edd6'
-  /src/main/java/com/monkeyk/sos/infrastructure/jdbc:
-    newFile: !uuid '8d8989438beaabe183a1545059ac8b84dae5487d'
-    oldFile: !uuid '5b1ca4295392e6d188def502cc98a5c8eae5db90'
-  /src/main/java/com/monkeyk/sos/infrastructure/jdbc/SOSAuthorizationCodeServices.java:
-    newFile: !uuid 'd6cce971816c98a8063e9750f9efc272993623fc'
-    oldFile: !uuid '457bc2d01d386fd47772497d4e0fd87ffd2f4a08'
-  /src/main/webapp:
-    newFile: !uuid '9b2e426dc53f2f818ad8a7824b567dbaadee89ff'
-    oldFile: !uuid '656b17f320cf0e68e043ad15fde8efd69cab4fb0'
-  /src/main/webapp/index.jsp:
-    newFile: !uuid '36b0172bcd18f72958f9c49e5655d9b05b8a5dee'
-    oldFile: !uuid '79da43393d468c0afad408ec360a3fdebb68a0ac'
-  /src/main/webapp/resources:
-    newFile: !uuid 'e53fae424283259709cfe7a184146475e6ac018c'
-    oldFile: !uuid '8ec7df90fd291e26c0e0ec99892086d829f2852d'
-  /src/main/webapp/resources/api:
-    newFile: !uuid 'c82138df3f1a46491f6be006ca3ff545b3f763b9'
-    oldFile: !uuid 'a104bd193d2dbab564b2ad4b912d9524d76788ce'
-  /src/main/webapp/resources/api/SOS_API-1.0.html:
-    newFile: !uuid '0549bc939a2f0ea035471619c9cf872a1a4c262a'
-    oldFile: null
-gitCommitId: !uuid '0284d8182740b6c21f686e461c05638860513632'
+  /README.md:
+    newFile: !uuid '7bc3ce661be5fe82db76630ab8a2f3d04db10590'
+    oldFile: !uuid '321c71ee437fcf7e11527f43e3386f07c39147f0'
+gitCommitId: !uuid '2cbf4bc3aee114caada64e2eca1ebe1a81f7617b'
 renames: {
   }
-revisionId: 294
+revisionId: 295