Merge remote-tracking branch 'upstream/two-dot-o' into two-dot-o
Merge remote-tracking branch 'upstream/two-dot-o' into two-dot-o
do not allow admin to see other user's credential information
Minor logging changes, also add Jackson v1 back to test-utils.
do not allow admin to see other user's credential information
do not allow admin to see other user's credential information
code refactoring
Merge pull request #230 from salihkardan/two-dot-o

Do not allow admin user to see other users' AWS credential infromation
REST tests now run without OOM errors because Tomcat is forked as a separate process. Also simplified how tests are run by removing concurrency (for now). Still needs some work and it might be better for us to fork Cassandra and ElasticSearch instead; seems like they might be easier to setup.
Merge branch 'two-dot-o' of https://github.com/usergrid/usergrid into two-dot-o
Ensure that TomcatMain process gets destroyed @after testing.
Merge branch 'two-dot-o' of https://github.com/usergrid/usergrid into two-dot-o

# By Salih Kardan (4) and Dave Johnson (3)
# Via Dave Johnson (2) and others
* 'two-dot-o' of https://github.com/usergrid/usergrid:
  Ensure that TomcatMain process gets destroyed @after testing.
  REST tests now run without OOM errors because Tomcat is forked as a separate process. Also simplified how tests are run by removing concurrency (for now). Still needs some work and it might be better for us to fork Cassandra and ElasticSearch instead; seems like they might be easier to setup.
  code refactoring
  do not allow admin to see other user's credential information
  do not allow admin to see other user's credential information
  Minor logging changes, also add Jackson v1 back to test-utils.
  do not allow admin to see other user's credential information