usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From g...@apache.org
Subject [6/6] usergrid git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/usergrid into USERGRID-1047
Date Thu, 14 Jan 2016 19:19:25 GMT
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/usergrid into USERGRID-1047

# Via Dave Johnson (1) and George Reyes (1)
* 'master' of https://git-wip-us.apache.org/repos/asf/usergrid:
  Added apache header to testing text. Fun fact time: The apache header adds 803 bytes unto
every file. For the 251 files of apache rat checked files we use 201 KB on headers alone!
  Added some comments and deleting found commented out code.
  Created a test that correctly emulates what occurs when running curl asset call.
  Added additional test file and test case to verify the issue in USERGRID-144. Also, added
fix to file not getting rid of text metadata and being properly replaced by image asset.


Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/ee8c7c4d
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/ee8c7c4d
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/ee8c7c4d

Branch: refs/heads/USERGRID-1047
Commit: ee8c7c4d023db8cc3b5c7dfb274492c2475de5c5
Parents: dae8254 a51ee2c
Author: George Reyes <grey@apache.org>
Authored: Thu Jan 14 11:19:05 2016 -0800
Committer: George Reyes <grey@apache.org>
Committed: Thu Jan 14 11:19:05 2016 -0800

----------------------------------------------------------------------
 .../rest/applications/ServiceResource.java      | 12 ++-
 .../applications/assets/AssetResourceIT.java    | 80 ++++++++++++++++++++
 stack/rest/src/test/resources/test.txt          | 17 +++++
 3 files changed, 105 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/usergrid/blob/ee8c7c4d/stack/rest/src/main/java/org/apache/usergrid/rest/applications/ServiceResource.java
----------------------------------------------------------------------


Mime
View raw message